diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 2a9d78d01..6af43b87d 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -67,11 +67,6 @@
         <option name="SMART_TABS" value="true" />
       </indentOptions>
     </codeStyleSettings>
-    <codeStyleSettings language="SCSS">
-      <indentOptions>
-        <option name="USE_TAB_CHARACTER" value="true" />
-      </indentOptions>
-    </codeStyleSettings>
     <codeStyleSettings language="XML">
       <option name="WRAP_ON_TYPING" value="1" />
     </codeStyleSettings>
diff --git a/application/datamodel.application.xml b/application/datamodel.application.xml
index e729d2103..15e148c57 100644
--- a/application/datamodel.application.xml
+++ b/application/datamodel.application.xml
@@ -15,5 +15,10 @@
     <menu id="AdminTools" xsi:type="MenuGroup" _delta="define">
       <rank>80</rank>
     </menu>
+    <menu id="System" xsi:type="MenuGroup" _delta="define">
+      <rank>100</rank>
+      <enable_class>ResourceSystemMenu</enable_class>
+      <enable_action>UR_ACTION_MODIFY</enable_action>
+    </menu>
   </menus>
 </itop_design>
diff --git a/datamodels/2.x/itop-backup/datamodel.itop-backup.xml b/datamodels/2.x/itop-backup/datamodel.itop-backup.xml
index c3281411a..588d49f00 100644
--- a/datamodels/2.x/itop-backup/datamodel.itop-backup.xml
+++ b/datamodels/2.x/itop-backup/datamodel.itop-backup.xml
@@ -2,8 +2,8 @@
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
   <menus>
     <menu id="BackupStatus" xsi:type="WebPageMenuNode" _delta="define">
-      <rank>15</rank>
-      <parent>AdminTools</parent>
+      <rank>50</rank>
+      <parent>System</parent>
       <url>status.php</url>
       <enable_admin_only>1</enable_admin_only>
     </menu>
diff --git a/datamodels/2.x/itop-backup/en.dict.itop-backup.php b/datamodels/2.x/itop-backup/en.dict.itop-backup.php
index 30f54ef6c..fd94c1ac6 100644
--- a/datamodels/2.x/itop-backup/en.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/en.dict.itop-backup.php
@@ -26,8 +26,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'bkp-backup-running' => 'A backup is running. Please wait...',
 	'bkp-restore-running' => 'A restore is running. Please wait...',
 
-	'Menu:BackupStatus' => 'Scheduled Backups',
-	'bkp-status-title' => 'Scheduled Backups',
+	'Menu:BackupStatus' => 'Backups',
+	'bkp-status-title' => 'Backups',
 	'bkp-status-checks' => 'Settings and checks',
 	'bkp-mysqldump-ok' => 'mysqldump is present: %1$s',
 	'bkp-mysqldump-notfound' => 'mysqldump could not be found: %1$s - Please make sure it is installed and in the path, or edit the configuration file to tune mysql_bindir.',
diff --git a/datamodels/2.x/itop-backup/fr.dict.itop-backup.php b/datamodels/2.x/itop-backup/fr.dict.itop-backup.php
index 69e05285d..e43e35ddb 100644
--- a/datamodels/2.x/itop-backup/fr.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/fr.dict.itop-backup.php
@@ -10,8 +10,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'bkp-backup-running' => 'Une sauvegarde est en cours. Veuillez patienter...',
 	'bkp-restore-running' => 'Une restauration des données est en cours. Veuillez patienter...',
 
-	'Menu:BackupStatus' => 'Sauvegarde automatique',
-	'bkp-status-title' => 'Sauvegarde automatique',
+	'Menu:BackupStatus' => 'Sauvegardes',
+	'bkp-status-title' => 'Sauvegardes',
 	'bkp-status-checks' => 'Réglages et vérifications',
 	'bkp-mysqldump-ok' => 'mysqldump est installé: %1$s',
 	'bkp-mysqldump-notfound' => 'mysqldump n\'a pas été trouvé: %1$s - Veuillez vous assurer que les outils mysql sont installés et qu\'ils sont accessibles en ligne de commande, ou bien éditez le fichier de configuration pour en donner le chemin via mysql_bindir.',
diff --git a/datamodels/2.x/itop-config/datamodel.itop-config.xml b/datamodels/2.x/itop-config/datamodel.itop-config.xml
index 98e97b2f1..169ac96ec 100644
--- a/datamodels/2.x/itop-config/datamodel.itop-config.xml
+++ b/datamodels/2.x/itop-config/datamodel.itop-config.xml
@@ -2,8 +2,8 @@
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
   <menus>
     <menu id="ConfigEditor" xsi:type="WebPageMenuNode" _delta="define">
-      <rank>50</rank>
-      <parent>AdminTools</parent>
+      <rank>10</rank>
+      <parent>Configuration</parent>
       <url>config.php</url>
       <enable_admin_only>1</enable_admin_only>
     </menu>
diff --git a/datamodels/2.x/itop-config/en.dict.itop-config.php b/datamodels/2.x/itop-config/en.dict.itop-config.php
index 4cbefc2e2..89ff11f11 100644
--- a/datamodels/2.x/itop-config/en.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/en.dict.itop-config.php
@@ -23,7 +23,7 @@
 
 Dict::Add('EN US', 'English', 'English', array(
 
-	'Menu:ConfigEditor' => 'Configuration',
+	'Menu:ConfigEditor' => 'General Configuration',
 	'config-edit-title' => 'Configuration File Editor',
 	'config-edit-intro' => 'Be very cautious when editing the configuration file.',
 	'config-apply' => 'Apply',
diff --git a/datamodels/2.x/itop-config/fr.dict.itop-config.php b/datamodels/2.x/itop-config/fr.dict.itop-config.php
index d9e05b3d5..5f3646710 100644
--- a/datamodels/2.x/itop-config/fr.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/fr.dict.itop-config.php
@@ -7,7 +7,7 @@
  */
 Dict::Add('FR FR', 'French', 'Français', array(
 
-	'Menu:ConfigEditor' => 'Configuration',
+	'Menu:ConfigEditor' => 'Configuration Générale',
 	'config-edit-title' => 'Editeur du Fichier de Configuration',
 	'config-edit-intro' => 'Attention: une configuration incorrecte peut rendre iTop inopérant pour tous les utilisateurs!',
 	'config-apply' => 'Enregistrer',
diff --git a/datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml b/datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml
index e0a5ba5c5..0a312db68 100644
--- a/datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml
+++ b/datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml
@@ -30,6 +30,16 @@
       <presentation/>
       <methods/>
     </class>
+    <class id="ResourceSystemMenu" _delta="define">
+      <parent>AbstractResource</parent>
+      <properties>
+        <comment>/* System menu access control. */</comment>
+        <abstract>true</abstract>
+        <category>grant_by_profile</category>
+      </properties>
+      <presentation/>
+      <methods/>
+    </class>
   </classes>
   <menus>
     <menu id="WelcomeMenu" xsi:type="MenuGroup" _delta="define">
@@ -87,9 +97,14 @@
       <rank>20</rank>
       <parent>WelcomeMenu</parent>
     </menu>
-    <menu id="UserAccountsMenu" xsi:type="OQLMenuNode" _delta="define">
-      <rank>1</rank>
+    <menu id="UserManagement" xsi:type="TemplateMenuNode" _delta="define">
+      <rank>10</rank>
       <parent>AdminTools</parent>
+      <template_file/>
+    </menu>
+    <menu id="UserAccountsMenu" xsi:type="OQLMenuNode" _delta="define">
+      <rank>11</rank>
+      <parent>UserManagement</parent>
       <oql><![CDATA[SELECT User]]></oql>
       <do_search>1</do_search>
       <search_form_open>1</search_form_open>
@@ -97,71 +112,79 @@
       <enable_action>UR_ACTION_MODIFY</enable_action>
     </menu>
     <menu id="ProfilesMenu" xsi:type="OQLMenuNode" _delta="define">
-      <rank>2</rank>
-      <parent>AdminTools</parent>
+      <rank>12</rank>
+      <parent>UserManagement</parent>
       <oql><![CDATA[SELECT URP_Profiles]]></oql>
       <do_search>1</do_search>
       <enable_class>URP_Profiles</enable_class>
       <enable_action>UR_ACTION_MODIFY</enable_action>
     </menu>
-    <menu id="NotificationsMenu" xsi:type="WebPageMenuNode" _delta="define">
-      <rank>3</rank>
-      <parent>AdminTools</parent>
-      <url>$pages/notifications.php</url>
-      <enable_class>Trigger</enable_class>
-      <enable_action>UR_ACTION_MODIFY</enable_action>
-    </menu>
     <menu id="AuditCategories" xsi:type="OQLMenuNode" _delta="define">
-      <rank>4</rank>
+      <rank>20</rank>
       <parent>AdminTools</parent>
       <oql><![CDATA[SELECT AuditCategory]]></oql>
       <do_search>1</do_search>
       <enable_class>AuditCategory</enable_class>
       <enable_action>UR_ACTION_MODIFY</enable_action>
     </menu>
-    <menu id="RunQueriesMenu" xsi:type="WebPageMenuNode" _delta="define">
-      <rank>8</rank>
+    <menu id="Queries" xsi:type="TemplateMenuNode" _delta="define">
+      <rank>30</rank>
       <parent>AdminTools</parent>
+      <template_file/>
+    </menu>
+    <menu id="RunQueriesMenu" xsi:type="WebPageMenuNode" _delta="define">
+      <rank>31</rank>
+      <parent>Queries</parent>
       <url>$pages/run_query.php</url>
       <enable_class>ResourceRunQueriesMenu</enable_class>
       <enable_action>UR_ACTION_MODIFY</enable_action>
     </menu>
     <menu id="QueryMenu" xsi:type="OQLMenuNode" _delta="define">
-      <rank>8.5</rank>
-      <parent>AdminTools</parent>
+      <rank>32</rank>
+      <parent>Queries</parent>
       <oql><![CDATA[SELECT Query]]></oql>
       <do_search>1</do_search>
       <enable_class>Query</enable_class>
       <enable_action>UR_ACTION_MODIFY</enable_action>
     </menu>
     <menu id="ExportMenu" xsi:type="WebPageMenuNode" _delta="define">
-      <rank>9.5</rank>
-      <parent>AdminTools</parent>
+      <rank>33</rank>
+      <parent>Queries</parent>
       <url>$webservices/export-v2.php?interactive=1</url>
       <enable_class>ResourceAdminMenu</enable_class>
       <enable_action>UR_ACTION_MODIFY</enable_action>
     </menu>
     <menu id="DataModelMenu" xsi:type="WebPageMenuNode" _delta="define">
-      <rank>10</rank>
+      <rank>40</rank>
       <parent>AdminTools</parent>
       <url>$pages/schema.php</url>
       <enable_class>ResourceRunQueriesMenu</enable_class>
       <enable_action>UR_ACTION_MODIFY</enable_action>
     </menu>
     <menu id="UniversalSearchMenu" xsi:type="WebPageMenuNode" _delta="define">
-      <rank>11</rank>
+      <rank>60</rank>
       <parent>AdminTools</parent>
       <url>$pages/UniversalSearch.php</url>
       <enable_class>ResourceAdminMenu</enable_class>
       <enable_action>UR_ACTION_MODIFY</enable_action>
     </menu>
+    <menu id="Configuration" xsi:type="MenuGroup" _delta="define">
+      <rank>90</rank>
+    </menu>
     <menu id="DataSources" xsi:type="OQLMenuNode" _delta="define">
-      <rank>12</rank>
-      <parent>AdminTools</parent>
+      <rank>20</rank>
+      <parent>Configuration</parent>
       <oql><![CDATA[SELECT SynchroDataSource]]></oql>
       <do_search>1</do_search>
       <enable_class>SynchroDataSource</enable_class>
       <enable_action>UR_ACTION_MODIFY</enable_action>
     </menu>
+    <menu id="NotificationsMenu" xsi:type="WebPageMenuNode" _delta="define">
+      <rank>40</rank>
+      <parent>Configuration</parent>
+      <url>$pages/notifications.php</url>
+      <enable_class>Trigger</enable_class>
+      <enable_action>UR_ACTION_MODIFY</enable_action>
+    </menu>
   </menus>
 </itop_design>
diff --git a/datamodels/2.x/itop-welcome-itil/en.dict.itop-welcome-itil.php b/datamodels/2.x/itop-welcome-itil/en.dict.itop-welcome-itil.php
index f3efad0de..a6cd75bca 100644
--- a/datamodels/2.x/itop-welcome-itil/en.dict.itop-welcome-itil.php
+++ b/datamodels/2.x/itop-welcome-itil/en.dict.itop-welcome-itil.php
@@ -28,7 +28,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Menu:WelcomeMenu+' => 'Welcome to iTop',
 	'Menu:WelcomeMenuPage' => 'Welcome',
 	'Menu:WelcomeMenuPage+' => 'Welcome to iTop',
-	'Menu:AdminTools' => 'Admin tools',
+	'Menu:AdminTools' => 'Administration',
 	'Menu:AdminTools+' => 'Administration tools',
 	'Menu:AdminTools?' => 'Tools accessible only to users having the administrator profile',
 	'Menu:DataModelMenu' => 'Data Model',
@@ -55,6 +55,9 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Menu:UserAccountsMenu+' => 'User Accounts',
 	'Menu:UserAccountsMenu:Title' => 'User Accounts',
 	'Menu:MyShortcuts' => 'My Shortcuts',
+	'Menu:UserManagement' => 'User Management',
+	'Menu:Queries' => 'Queries',
+	'Menu:Configuration' => 'Configuration',
 ));
 
 //
@@ -83,3 +86,12 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:ResourceRunQueriesMenu' => 'Resource Run Queries Menu',
 	'Class:ResourceRunQueriesMenu+' => '',
 ));
+
+//
+// Class: Action
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:ResourceSystemMenu' => 'Resource System Menu',
+	'Class:ResourceSystemMenu+' => '',
+));
diff --git a/datamodels/2.x/itop-welcome-itil/fr.dict.itop-welcome-itil.php b/datamodels/2.x/itop-welcome-itil/fr.dict.itop-welcome-itil.php
index 29e765c01..611fa3710 100644
--- a/datamodels/2.x/itop-welcome-itil/fr.dict.itop-welcome-itil.php
+++ b/datamodels/2.x/itop-welcome-itil/fr.dict.itop-welcome-itil.php
@@ -26,7 +26,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Menu:WelcomeMenu+' => 'Bienvenue dans iTop',
 	'Menu:WelcomeMenuPage' => 'Bienvenue',
 	'Menu:WelcomeMenuPage+' => 'Bienvenue dans iTop',
-	'Menu:AdminTools' => 'Outils d\'admin',
+	'Menu:AdminTools' => 'Administration',
 	'Menu:AdminTools+' => 'Outils d\'administration',
 	'Menu:AdminTools?' => 'Ces outils sont accessibles uniquement aux utilisateurs possédant le profil Administrateur.',
 	'Menu:DataModelMenu' => 'Modèle de Données',
@@ -53,6 +53,9 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Menu:UserAccountsMenu+' => 'Comptes Utilisateurs',
 	'Menu:UserAccountsMenu:Title' => 'Comptes Utilisateurs',
 	'Menu:MyShortcuts' => 'Mes raccourcis',
+	'Menu:UserManagement' => 'Utilisateurs',
+	'Menu:Queries' => 'Requêtes',
+	'Menu:Configuration' => 'Configuration',
 ));
 
 //
@@ -81,3 +84,12 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:ResourceRunQueriesMenu' => 'Menu Requête OQL',
 	'Class:ResourceRunQueriesMenu+' => '',
 ));
+
+//
+// Class: Action
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:ResourceSystemMenu' => 'Menu System',
+	'Class:ResourceSystemMenu+' => '',
+));
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index 82fb7f0b3..104f023c9 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -900,9 +900,10 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:UserManagement:LinkBetween_User_And_Profile' => 'Link between %1$s and %2$s',
 	'UI:UserManagement:LinkBetween_User_And_Org' => 'Link between %1$s and %2$s',
 
-	'Menu:AdminTools' => 'Admin tools', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools' => 'Administration', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:AdminTools+' => 'Administration tools', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:AdminTools?' => 'Tools accessible only to users having the administrator profile', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:System' => 'System',
 
 	'UI:ChangeManagementMenu' => 'Change Management',
 	'UI:ChangeManagementMenu+' => 'Change Management',
diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php
index bd8556640..e6ed73a9c 100644
--- a/dictionaries/fr.dictionary.itop.ui.php
+++ b/dictionaries/fr.dictionary.itop.ui.php
@@ -886,6 +886,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Menu:AdminTools' => 'Outils d\'admin', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:AdminTools+' => 'Outils d\'administration', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:AdminTools?' => 'Ces outils sont accessibles uniquement aux utilisateurs possédant le profil Administrateur.', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:System' => 'Système',
 
 	'UI:ChangeManagementMenu' => 'Gestion du Changement',
 	'UI:ChangeManagementMenu+' => 'Gestion du Changement',
diff --git a/test/OQL/OQLToSQLAllClassesTest.php b/test/OQL/OQLToSQLAllClassesTest.php
index a09fe0399..ab021885c 100644
--- a/test/OQL/OQLToSQLAllClassesTest.php
+++ b/test/OQL/OQLToSQLAllClassesTest.php
@@ -278,7 +278,7 @@ class OQLToSQLAllCLassesTest extends ItopDataTestCase
 		return null;
 	}
 
-	static $aPureAbstractClasses = ['AbstractResource', 'ResourceAdminMenu', 'ResourceRunQueriesMenu', 'ResourceItopIntegrityMenu'];
+	static $aPureAbstractClasses = ['AbstractResource', 'ResourceAdminMenu', 'ResourceRunQueriesMenu', 'ResourceSystemMenu'];
 
 	public function OQLSelectProvider()
 	{