diff --git a/installer/deb/share/applications/filebot.desktop b/installer/deb/share/applications/filebot.desktop
index f09830fe..01ab36c3 100644
--- a/installer/deb/share/applications/filebot.desktop
+++ b/installer/deb/share/applications/filebot.desktop
@@ -3,11 +3,13 @@ Type=Application
 Name=@{application.name}
 Comment=@{package.synopsis}
 MimeType=inode/directory;video/*;audio/*;text/*;
+Terminal=false
 Exec=filebot %F
 Icon=filebot
-StartupNotify=true
 Categories=@{gnome.application.categories}
 Actions=Rename;Subtitles;Checksum;
+StartupNotify=true
+StartupWMClass=net-filebot-Main
 X-Ubuntu-Gettext-Domain=@{package.name}
 
 [Desktop Action Rename]
diff --git a/source/net/filebot/Main.java b/source/net/filebot/Main.java
index 9ad1f5f7..39e6a07a 100644
--- a/source/net/filebot/Main.java
+++ b/source/net/filebot/Main.java
@@ -217,11 +217,8 @@ public class Main {
 			MacAppUtilities.setDefaultMenuBar(FileBotMenuBar.createHelp());
 			MacAppUtilities.setOpenFileHandler(openFiles -> SwingEventBus.getInstance().post(new FileTransferable(openFiles)));
 		} else if (isUbuntuApp()) {
-			if ("Unity".equals(System.getenv("XDG_CURRENT_DESKTOP"))) {
-				frame.setTitle(Settings.getApplicationUserModelID());
-			} else {
-				frame.setIconImages(ResourceManager.getApplicationIcons());
-			}
+			// Ubuntu/Debian specific configuration
+			// .desktop file will take care of icons and desktop integration
 		} else if (isWindowsApp()) {
 			// Windows specific configuration
 			if (!isAppStore()) {