diff --git a/Makefile b/Makefile
index bb8f73d..57deedd 100644
--- a/Makefile
+++ b/Makefile
@@ -13,10 +13,10 @@ install-resources:
 	mkdir -p $(PREFIX)/share/nvim-gtk/
 	cp -r runtime $(PREFIX)/share/nvim-gtk/ 
 	mkdir -p $(PREFIX)/share/applications/
-	cp desktop/nvim-gtk.desktop $(PREFIX)/share/applications/
-	sed -i "s|Exec=nvim-gtk|Exec=$(PREFIX)/bin/nvim-gtk|" $(PREFIX)/share/applications/nvim-gtk.desktop
+	cp desktop/org.daa.NeovimGtk.desktop $(PREFIX)/share/applications/
+	sed -i "s|Exec=nvim-gtk|Exec=$(PREFIX)/bin/nvim-gtk|" $(PREFIX)/share/applications/org.daa.NeovimGtk.desktop
 	mkdir -p $(PREFIX)/share/icons/hicolor/128x128/apps/
-	cp desktop/nvim-gtk.png $(PREFIX)/share/icons/hicolor/128x128/apps/
+	cp desktop/org.daa.NeovimGtk.png $(PREFIX)/share/icons/hicolor/128x128/apps/
 	mkdir -p $(PREFIX)/share/fonts/
 	cp -n desktop/dejavu_font/*.ttf $(PREFIX)/share/fonts/
 	fc-cache -fv
diff --git a/desktop/nvim-gtk.desktop b/desktop/org.daa.NeovimGtk.desktop
similarity index 88%
rename from desktop/nvim-gtk.desktop
rename to desktop/org.daa.NeovimGtk.desktop
index 01a3973..5b8207d 100644
--- a/desktop/nvim-gtk.desktop
+++ b/desktop/org.daa.NeovimGtk.desktop
@@ -2,7 +2,7 @@
 Name=NeovimGtk
 Comment=Gtk GUI for Neovim text editor
 Exec=nvim-gtk -- %F
-Icon=nvim-gtk
+Icon=org.daa.NeovimGtk
 Type=Application
 Terminal=false
 Categories=GTK;Utility;TextEditor;
diff --git a/desktop/nvim-gtk.png b/desktop/org.daa.NeovimGtk.png
similarity index 100%
rename from desktop/nvim-gtk.png
rename to desktop/org.daa.NeovimGtk.png
diff --git a/src/main.rs b/src/main.rs
index a4bde67..e2cf6c1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -71,8 +71,6 @@ fn main() {
         app.connect_open(open);
     }
 
-    gtk::Window::set_default_icon_name("nvim-gtk");
-
     let args: Vec<String> = env::args().collect();
     let argv: Vec<&str> = args.iter()
         .filter(|a| !a.starts_with(BIN_PATH_ARG))
diff --git a/src/ui.rs b/src/ui.rs
index 7c07794..64c0906 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -125,7 +125,7 @@ impl Ui {
         window.add(&**shell);
 
         window.show_all();
-        window.set_title("NeoVim-gtk");
+        window.set_title("NeovimGtk");
 
         let comps_ref = self.comps.clone();
         let shell_ref = self.shell.clone();
@@ -165,7 +165,7 @@ fn on_help_about(comps: &Components) {
     about.set_transient_for(comps.window.as_ref());
     about.set_program_name("NeovimGtk");
     about.set_version(env!("CARGO_PKG_VERSION"));
-    about.set_logo_icon_name("nvim-gtk");
+    about.set_logo_icon_name("org.daa.NeovimGtk");
     about.set_authors(&[env!("CARGO_PKG_AUTHORS")]);
 
     about.connect_response(|about, _| about.destroy());