diff --git a/Thunar-bulk-rename.desktop.in.in b/Thunar-bulk-rename.desktop.in.in
index 5239d928e3fce94e486219893682faf7911bc4b8..df8d58b63f0fcdec3e26d63afef8988dc5f521e4 100644
--- a/Thunar-bulk-rename.desktop.in.in
+++ b/Thunar-bulk-rename.desktop.in.in
@@ -7,6 +7,6 @@ Icon=Thunar
 Terminal=false
 StartupNotify=true
 Type=Application
-Categories=Application;System;Utility;Core;GTK;Filesystem;
+Categories=System;Utility;Core;GTK;Filesystem;
 
 # vi:set encoding=UTF-8:
diff --git a/Thunar-folder-handler.desktop.in.in b/Thunar-folder-handler.desktop.in.in
index 603ffdc922b1707762c1c72da4f32d061c5b2b07..9c4e1316a2e11869b899d08a0e3a047a6a82f132 100644
--- a/Thunar-folder-handler.desktop.in.in
+++ b/Thunar-folder-handler.desktop.in.in
@@ -9,7 +9,7 @@ NoDisplay=true
 Terminal=false
 StartupNotify=true
 Type=Application
-Categories=System;Utility;Core;GTK;FileManager;
-MimeType=x-directory/gnome-default-handler;x-directory/normal;inode/directory;
+Categories=System;Utility;Core;GTK;FileTools;FileManager;
+MimeType=inode/directory;
 
 # vi:set encoding=UTF-8:
diff --git a/Thunar.desktop.in.in b/Thunar.desktop.in.in
index d14ab2ed6dbc7d9821b1b2b0b8b71ec2ebc6d847..a97fe57570c03102cc34b35bcf5594b2734f314f 100644
--- a/Thunar.desktop.in.in
+++ b/Thunar.desktop.in.in
@@ -7,6 +7,6 @@ Icon=Thunar
 Terminal=false
 StartupNotify=true
 Type=Application
-Categories=Application;System;Utility;Core;GTK;FileManager;
+Categories=System;Utility;Core;GTK;FileTools;FileManager;
 
 # vi:set encoding=UTF-8: