diff --git a/debian/kali-themes.postinst b/debian/kali-themes.postinst
index c38f3584..13ef8634 100644
--- a/debian/kali-themes.postinst
+++ b/debian/kali-themes.postinst
@@ -13,6 +13,7 @@ FILES_TO_DIVERT="
 /etc/xdg/konsolerc
 /etc/xdg/kscreenlockerrc
 /etc/xdg/kwinrc
+/etc/xdg/menus/xfce-settings-manager.menu
 /etc/xdg/plasmarc
 /etc/xdg/qt5ct/qt5ct.conf
 /etc/xdg/qterminal.org/qterminal.ini
@@ -99,6 +100,7 @@ if [ "$1" = "configure" ]; then
 	    install_config_file /etc/xdg/xfce4/panel/default.xml force
 	    install_config_file /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml force
 	    install_config_file /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml force
+	    install_config_file /etc/xdg/menus/xfce-settings-manager.menu force
 	fi
 	# Install remaining new files
 	install_all
diff --git a/debian/kali-themes.postrm b/debian/kali-themes.postrm
index b52ceccb..a0e6a625 100644
--- a/debian/kali-themes.postrm
+++ b/debian/kali-themes.postrm
@@ -13,6 +13,7 @@ FILES_TO_DIVERT="
 /etc/xdg/konsolerc
 /etc/xdg/kscreenlockerrc
 /etc/xdg/kwinrc
+/etc/xdg/menus/xfce-settings-manager.menu
 /etc/xdg/plasmarc
 /etc/xdg/qt5ct/qt5ct.conf
 /etc/xdg/qterminal.org/qterminal.ini
diff --git a/debian/kali-themes.preinst b/debian/kali-themes.preinst
index 808f23b2..761125fe 100644
--- a/debian/kali-themes.preinst
+++ b/debian/kali-themes.preinst
@@ -13,6 +13,7 @@ FILES_TO_DIVERT="
 /etc/xdg/konsolerc
 /etc/xdg/kscreenlockerrc
 /etc/xdg/kwinrc
+/etc/xdg/menus/xfce-settings-manager.menu
 /etc/xdg/plasmarc
 /etc/xdg/qt5ct/qt5ct.conf
 /etc/xdg/qterminal.org/qterminal.ini
diff --git a/etc/xdg/menus/xfce-settings-manager.menu b/etc/xdg/menus/xfce-settings-manager.menu
new file mode 100644
index 00000000..e8da0e30
--- /dev/null
+++ b/etc/xdg/menus/xfce-settings-manager.menu
@@ -0,0 +1,127 @@
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+
+<Menu>
+  <Name>Settings</Name>
+
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+  <DefaultMergeDirs/>
+
+  <Layout>
+    <Menuname>Personal</Menuname>
+    <Menuname>Hardware</Menuname>
+    <Menuname>System</Menuname>
+    <Menuname>Other</Menuname>
+    <Merge type="menus"/>
+    <Merge type="files"/>
+  </Layout>
+
+  <Include>
+    <And>
+      <Category>Settings</Category>
+      <Not>
+        <Or>
+          <Category>X-XFCE-PersonalSettings</Category>
+          <Category>X-XFCE-HardwareSettings</Category>
+          <Category>X-XFCE-SystemSettings</Category>
+        </Or>
+      </Not>
+    </And>
+  </Include>
+
+  <Exclude>
+    <Filename>xfce-settings-manager.desktop</Filename>
+  </Exclude>
+
+  <Menu>
+    <Name>Personal</Name>
+    <Directory>xfce-personal.directory</Directory>
+    <Include>
+      <And>
+        <Category>Settings</Category>
+        <Category>X-XFCE-SettingsDialog</Category>
+        <Category>X-XFCE-PersonalSettings</Category>
+      </And>
+      <And>
+        <Category>Settings</Category>
+        <Category>DesktopSettings</Category>
+      </And>
+      <Filename>xscreensaver-properties.desktop</Filename>
+    </Include>
+    <Exclude>
+      <Category>X-XFCE-HardwareSettings</Category>
+      <Category>X-XFCE-SystemSettings</Category>
+      <Filename>xfce4-settings-editor.desktop</Filename>
+      <Filename>xfce-settings-manager.desktop</Filename>
+    </Exclude>
+  </Menu>
+
+  <Menu>
+    <Name>Hardware</Name>
+    <Directory>xfce-hardware.directory</Directory>
+    <Include>
+      <And>
+        <Category>Settings</Category>
+        <Category>X-XFCE-SettingsDialog</Category>
+        <Category>X-XFCE-HardwareSettings</Category>
+      </And>
+      <And>
+        <Category>Settings</Category>
+        <Category>HardwareSettings</Category>
+        <Not><Category>System</Category></Not>
+      </And>
+      <Filename>nm-connection-editor.desktop</Filename>
+      <Filename>system-config-printer.desktop</Filename>
+      <Filename>settings-hardware-sound.desktop</Filename>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>System</Name>
+    <Directory>xfce-system.directory</Directory>
+    <Include>
+      <And>
+        <Category>Settings</Category>
+        <Category>X-XFCE-SettingsDialog</Category>
+        <Category>X-XFCE-SystemSettings</Category>
+      </And>
+      <And>
+        <Category>Settings</Category>
+        <Category>System</Category>
+        <Not><Category>PackageManager</Category></Not>
+      </And>
+      <Filename>software-properties-gtk.desktop</Filename>
+    </Include>
+    <Exclude>
+      <Filename>system-config-printer.desktop</Filename>
+    </Exclude>
+  </Menu>
+
+  <Menu>
+    <Name>Other</Name>
+    <Directory>xfce-other.directory</Directory>
+    <Include>
+      <And>
+        <Category>Settings</Category>
+        <Not>
+          <Or>
+            <Category>X-XFCE-PersonalSettings</Category>
+            <Category>X-XFCE-SystemSettings</Category>
+            <Category>X-XFCE-HardwareSettings</Category>
+            <Category>DesktopSettings</Category>
+            <Category>HardwareSettings</Category>
+            <Category>System</Category>
+            <Filename>nm-connection-editor.desktop</Filename>
+            <Filename>software-properties-gtk.desktop</Filename>
+            <Filename>xscreensaver-properties.desktop</Filename>
+            <Filename>xfce-settings-manager.desktop</Filename>
+          </Or>
+        </Not>
+      </And>
+      <Filename>xfce4-settings-editor.desktop</Filename>
+    </Include>
+  </Menu>
+
+</Menu>
+
diff --git a/files-to-divert b/files-to-divert
index 9621aa71..79980488 100644
--- a/files-to-divert
+++ b/files-to-divert
@@ -8,6 +8,7 @@
 /etc/xdg/konsolerc
 /etc/xdg/kscreenlockerrc
 /etc/xdg/kwinrc
+/etc/xdg/menus/xfce-settings-manager.menu
 /etc/xdg/plasmarc
 /etc/xdg/qt5ct/qt5ct.conf
 /etc/xdg/qterminal.org/qterminal.ini