Index: mate-menus-1.22.0/layout/mate-settings.menu
===================================================================
--- mate-menus-1.22.0/layout/mate-settings.menu
+++ mate-menus-1.22.0/layout/mate-settings.menu	2019-03-11 20:12:20.143615781 +0100
@@ -41,11 +41,48 @@
   <Menu>
     <Name>Administration</Name>
     <Directory>mate-settings-system.directory</Directory>
+     <Layout>
+        <Filename>mandriva-drakconf.desktop</Filename>
+        <Separator/>
+        <Merge type="all"/>
+     </Layout>
     <Include>
       <And>
-        <Category>Settings</Category>
-        <Category>System</Category>
-      </And>
+            <!-- never show those, they are in preference menu -->
+            <Not>
+              <Category>MATE</Category>
+            </Not>
+            <Category>HardwareSettings</Category>
+        </And>
+       <And>
+          <Or>
+            <Or>
+              <Category>GTK</Category>
+              <Category>X-MandrivaLinux-CrossDesktop</Category>
+            </Or>
+            <Not>
+              <Category>FileTools</Category>
+              <Category>FileSystem</Category>
+              <Category>Security</Category>
+              <Category>Applet</Category>
+              <Category>KDE</Category>
+              <Category>Qt</Category>
+            </Not>
+          </Or>
+          <Or>
+            <And>
+              <Category>System</Category>
+              <Not>
+                <Category>Emulator</Category>
+                <Category>TerminalEmulator</Category>
+              </Not>
+            </And>
+            <Category>Monitor</Category>
+          </Or>
+        </And>
+        <Category>PackageManager</Category>
+        <Category>Printing</Category>
+
     </Include>
   </Menu>     <!-- End System Settings -->