diff --git a/lookandfeel/contents/logout/BreezeBlock.qml b/lookandfeel/contents/components/BreezeBlock.qml
similarity index 100%
rename from lookandfeel/contents/logout/BreezeBlock.qml
rename to lookandfeel/contents/components/BreezeBlock.qml
diff --git a/lookandfeel/contents/logout/LogoutScreen.qml b/lookandfeel/contents/components/LogoutScreen.qml
similarity index 95%
rename from lookandfeel/contents/logout/LogoutScreen.qml
rename to lookandfeel/contents/components/LogoutScreen.qml
index 6160477fe..1f7825d60 100644
--- a/lookandfeel/contents/logout/LogoutScreen.qml
+++ b/lookandfeel/contents/components/LogoutScreen.qml
@@ -96,19 +96,19 @@ BreezeBlock {
                 name: "shutdown"
                 PropertyChanges { target: root; currentAction: shutdownRequested }
                 PropertyChanges { target: actionLabel; text: ("Shutting down") }
-                PropertyChanges { target: actionIcon; source: "icons/shutdown_primary.svgz" }
+                PropertyChanges { target: actionIcon; source: "artwork/shutdown_primary.svgz" }
             },
             State {
                 name: "logout"
                 PropertyChanges { target: root; currentAction: logoutRequested }
                 PropertyChanges { target: actionLabel; text: ("Logging out") }
-                PropertyChanges { target: actionIcon; source: "icons/logout_primary.svgz" }
+                PropertyChanges { target: actionIcon; source: "artwork/logout_primary.svgz" }
             },
             State {
                 name: "reboot"
                 PropertyChanges { target: root; currentAction: rebootRequested }
                 PropertyChanges { target: actionLabel; text: ("Rebooting") }
-                PropertyChanges { target: actionIcon; source: "icons/restart_primary.svgz" }
+                PropertyChanges { target: actionIcon; source: "artwork/restart_primary.svgz" }
             }
         ]
     }
diff --git a/lookandfeel/contents/logout/icons/currentColorFillFix.sh b/lookandfeel/contents/components/artwork/currentColorFillFix.sh
similarity index 100%
rename from lookandfeel/contents/logout/icons/currentColorFillFix.sh
rename to lookandfeel/contents/components/artwork/currentColorFillFix.sh
diff --git a/lookandfeel/contents/logout/icons/logout_primary.svgz b/lookandfeel/contents/components/artwork/logout_primary.svgz
similarity index 100%
rename from lookandfeel/contents/logout/icons/logout_primary.svgz
rename to lookandfeel/contents/components/artwork/logout_primary.svgz
diff --git a/lookandfeel/contents/logout/icons/restart_primary.svgz b/lookandfeel/contents/components/artwork/restart_primary.svgz
similarity index 100%
rename from lookandfeel/contents/logout/icons/restart_primary.svgz
rename to lookandfeel/contents/components/artwork/restart_primary.svgz
diff --git a/lookandfeel/contents/logout/icons/shutdown_primary.svgz b/lookandfeel/contents/components/artwork/shutdown_primary.svgz
similarity index 100%
rename from lookandfeel/contents/logout/icons/shutdown_primary.svgz
rename to lookandfeel/contents/components/artwork/shutdown_primary.svgz
diff --git a/lookandfeel/contents/logout/Logout.qml b/lookandfeel/contents/logout/Logout.qml
index be1ad302a..3e61f19d2 100644
--- a/lookandfeel/contents/logout/Logout.qml
+++ b/lookandfeel/contents/logout/Logout.qml
@@ -18,6 +18,7 @@
  ***************************************************************************/
 
 import QtQuick 2.1
+import "../components"
 
 Item {
     id: root