diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index 6b97444d..f5796651 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -14,7 +14,11 @@ find_packages(MAIN_PACKAGES REQUIRED
 )
 
 set(RESOURCE_LIST
+    dino-conversation-list-placeholder-arrow.svg
+
     icons/scalable/actions/dino-account-plus-symbolic.svg
+    icons/scalable/actions/dino-emoticon-symbolic.svg
+    icons/scalable/actions/dino-qr-code-symbolic.svg
 
     icons/scalable/apps/im.dino.Dino.svg
     icons/scalable/apps/im.dino.Dino-symbolic.svg
@@ -27,8 +31,6 @@ set(RESOURCE_LIST
     icons/scalable/devices/dino-phone-ring-symbolic.svg
     icons/scalable/devices/dino-phone-symbolic.svg
 
-    icons/scalable/emotes/dino-emoticon-symbolic.svg
-
     icons/scalable/mimetypes/dino-file-document-symbolic.svg
     icons/scalable/mimetypes/dino-file-download-symbolic.svg
     icons/scalable/mimetypes/dino-file-image-symbolic.svg
@@ -40,6 +42,7 @@ set(RESOURCE_LIST
     icons/scalable/status/dino-double-tick-symbolic.svg
     icons/scalable/status/dino-microphone-off-symbolic.svg
     icons/scalable/status/dino-microphone-symbolic.svg
+    icons/scalable/status/dino-party-popper-symbolic.svg
     icons/scalable/status/dino-security-high-symbolic.svg
     icons/scalable/status/dino-status-away.svg
     icons/scalable/status/dino-status-chat.svg
@@ -49,10 +52,6 @@ set(RESOURCE_LIST
     icons/scalable/status/dino-video-off-symbolic.svg
     icons/scalable/status/dino-video-symbolic.svg
 
-    icons/scalable/ui/dino-conversation-list-placeholder-arrow.svg
-    icons/scalable/ui/dino-qr-code-symbolic.svg
-    icons/scalable/ui/dino-party-popper-symbolic.svg
-
     add_conversation/add_contact_dialog.ui
     add_conversation/add_groupchat_dialog.ui
     add_conversation/conference_details_fragment.ui
diff --git a/main/data/icons/scalable/ui/dino-conversation-list-placeholder-arrow.svg b/main/data/dino-conversation-list-placeholder-arrow.svg
similarity index 100%
rename from main/data/icons/scalable/ui/dino-conversation-list-placeholder-arrow.svg
rename to main/data/dino-conversation-list-placeholder-arrow.svg
diff --git a/main/data/icons/scalable/emotes/dino-emoticon-symbolic.svg b/main/data/icons/scalable/actions/dino-emoticon-symbolic.svg
similarity index 100%
rename from main/data/icons/scalable/emotes/dino-emoticon-symbolic.svg
rename to main/data/icons/scalable/actions/dino-emoticon-symbolic.svg
diff --git a/main/data/icons/scalable/ui/dino-qr-code-symbolic.svg b/main/data/icons/scalable/actions/dino-qr-code-symbolic.svg
similarity index 100%
rename from main/data/icons/scalable/ui/dino-qr-code-symbolic.svg
rename to main/data/icons/scalable/actions/dino-qr-code-symbolic.svg
diff --git a/main/data/icons/scalable/ui/dino-party-popper-symbolic.svg b/main/data/icons/scalable/status/dino-party-popper-symbolic.svg
similarity index 100%
rename from main/data/icons/scalable/ui/dino-party-popper-symbolic.svg
rename to main/data/icons/scalable/status/dino-party-popper-symbolic.svg
diff --git a/main/src/ui/main_window.vala b/main/src/ui/main_window.vala
index 1f1a7688..14058a29 100644
--- a/main/src/ui/main_window.vala
+++ b/main/src/ui/main_window.vala
@@ -77,7 +77,7 @@ public class MainWindow : Gtk.Window {
         search_frame.set_child(global_search.get_widget());
 
         Image conversation_list_placeholder_image = (Image) builder.get_object("conversation_list_placeholder_image");
-        conversation_list_placeholder_image.set_from_pixbuf(new Pixbuf.from_resource("/im/dino/Dino/icons/scalable/ui/dino-conversation-list-placeholder-arrow.svg"));
+        conversation_list_placeholder_image.set_from_pixbuf(new Pixbuf.from_resource("/im/dino/Dino/dino-conversation-list-placeholder-arrow.svg"));
     }
 
     private void setup_headerbar() {