diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index 3e23fffc..28cd355d 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -17,7 +17,7 @@ set(RESOURCE_LIST
     icons/dino-status-chat.svg
     icons/dino-status-dnd.svg
     icons/dino-status-online.svg
-    icons/dino-symbolic.svg
+    icons/im.dino.Dino-symbolic.svg
     icons/dino-tick-symbolic.svg
 
     add_conversation/add_contact_dialog.ui
@@ -147,10 +147,10 @@ if(WIN32)
 endif(WIN32)
 
 install(TARGETS dino ${TARGET_INSTALL})
-install(FILES data/im.dino.desktop DESTINATION ${DESKTOP_FILE_INSTALL_DIR})
-install(FILES data/im.dino.service DESTINATION ${SERVICE_FILE_INSTALL_DIR})
-install(FILES data/icons/dino.svg DESTINATION ${ICON_INSTALL_DIR}/hicolor/scalable/apps)
-install(FILES data/icons/dino-symbolic.svg DESTINATION ${ICON_INSTALL_DIR}/hicolor/symbolic/apps)
+install(FILES data/im.dino.Dino.desktop DESTINATION ${DESKTOP_FILE_INSTALL_DIR})
+install(FILES data/im.dino.Dino.service DESTINATION ${SERVICE_FILE_INSTALL_DIR})
+install(FILES data/icons/im.dino.Dino.svg DESTINATION ${ICON_INSTALL_DIR}/hicolor/scalable/apps)
+install(FILES data/icons/im.dino.Dino-symbolic.svg DESTINATION ${ICON_INSTALL_DIR}/hicolor/symbolic/apps)
 install(FILES
     data/icons/dino-status-away.svg
     data/icons/dino-status-chat.svg
diff --git a/main/data/icons/dino-symbolic.svg b/main/data/icons/im.dino.Dino-symbolic.svg
similarity index 100%
rename from main/data/icons/dino-symbolic.svg
rename to main/data/icons/im.dino.Dino-symbolic.svg
diff --git a/main/data/icons/dino.svg b/main/data/icons/im.dino.Dino.svg
similarity index 100%
rename from main/data/icons/dino.svg
rename to main/data/icons/im.dino.Dino.svg
diff --git a/main/data/im.dino.desktop b/main/data/im.dino.Dino.desktop
similarity index 94%
rename from main/data/im.dino.desktop
rename to main/data/im.dino.Dino.desktop
index b53ef111..90f3e38f 100644
--- a/main/data/im.dino.desktop
+++ b/main/data/im.dino.Dino.desktop
@@ -4,7 +4,7 @@ Name=Dino
 GenericName=Jabber/XMPP Client
 Keywords=chat;talk;im;message;xmpp;jabber;
 Exec=dino %U
-Icon=dino
+Icon=im.dino.Dino
 StartupNotify=false
 Terminal=false
 Type=Application
diff --git a/main/data/im.dino.service b/main/data/im.dino.Dino.service
similarity index 59%
rename from main/data/im.dino.service
rename to main/data/im.dino.Dino.service
index 02339e92..8f6ebbba 100644
--- a/main/data/im.dino.service
+++ b/main/data/im.dino.Dino.service
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=im.dino
+Name=im.dino.Dino
 Exec=dino
diff --git a/main/data/unified_window_placeholder.ui b/main/data/unified_window_placeholder.ui
index 70307e6e..429c95c6 100644
--- a/main/data/unified_window_placeholder.ui
+++ b/main/data/unified_window_placeholder.ui
@@ -13,7 +13,7 @@
                 <property name="visible">True</property>
                 <child>
                     <object class="GtkImage">
-                        <property name="icon-name">dino-symbolic</property>
+                        <property name="icon-name">im.dino.Dino-symbolic</property>
                         <property name="pixel-size">144</property>
                         <property name="margin">30</property>
                         <property name="visible">True</property>
diff --git a/main/src/ui/application.vala b/main/src/ui/application.vala
index e4fdd9eb..e8424684 100644
--- a/main/src/ui/application.vala
+++ b/main/src/ui/application.vala
@@ -14,10 +14,10 @@ public class Dino.Ui.Application : Gtk.Application, Dino.Application {
     public SearchPathGenerator? search_path_generator { get; set; }
 
     public Application() throws Error {
-        Object(application_id: "im.dino", flags: ApplicationFlags.HANDLES_OPEN);
+        Object(application_id: "im.dino.Dino", flags: ApplicationFlags.HANDLES_OPEN);
         init();
         Environment.set_application_name("Dino");
-        Window.set_default_icon_name("dino");
+        Window.set_default_icon_name("im.dino.Dino");
 
         CssProvider provider = new CssProvider();
         provider.load_from_resource("/im/dino/theme.css");