diff --git a/Gruntfile.js b/Gruntfile.js
index 14d1404e7d4a308f8cc98215ee65f2f52ce954c5..4c50be920fa914c5dd2605e0724abccc62e9a885 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -65,7 +65,7 @@ module.exports = function (grunt) {
          */
         backend: [
             'less:backend',
-            'replace:example',
+            'replace:escapeCalc',
             'less:override'
         ],
         /**
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
index 63cbbf33a9b34bcbd3e3f6e8a83f2c6c519f6f34..0886abc84b4fc495da26a5ad1ca1cc93fc3dbfd1 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
@@ -234,13 +234,14 @@
         .parent {
             margin-bottom: 4.5rem;
             //  Section title
-            //  ToDo UI: Should be not a link, strong instead and have a classname
-            > a {
+            > a, // ToDo UI: Should be deleted after template changes a -> strong.submenu-group-title
+            .submenu-group-title {
                 color: @submenu-section-label__color;
                 display: block;
                 font-size: 1.6rem;
                 font-weight: @font-weight__semibold;
                 margin-bottom: .7rem;
+                padding: 1.25rem @submenu__padding-horizontal;
                 pointer-events: none;
             }
         }
diff --git a/app/design/adminhtml/Magento/backend/web/css/override.less b/app/design/adminhtml/Magento/backend/web/css/override.less
index bc0ec5fd09315277aba8f3255d921c24c24b1b89..550c2b105c3ff80c4814e39d99394632d75109d5 100644
--- a/app/design/adminhtml/Magento/backend/web/css/override.less
+++ b/app/design/adminhtml/Magento/backend/web/css/override.less
@@ -2791,6 +2791,7 @@ fieldset[disabled] .admin__control-text + .ui-datepicker-trigger {
   margin: 0 0 3rem;
 }
 .page-layout-admin-login {
+  align-items: center;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
@@ -3197,12 +3198,14 @@ fieldset[disabled] .admin__control-text + .ui-datepicker-trigger {
 .admin__menu .submenu .parent {
   margin-bottom: 4.5rem;
 }
-.admin__menu .submenu .parent > a {
+.admin__menu .submenu .parent > a,
+.admin__menu .submenu .parent .submenu-group-title {
   color: #a79d95;
   display: block;
   font-size: 1.6rem;
   font-weight: 600;
   margin-bottom: .7rem;
+  padding: 1.25rem 1.5rem;
   pointer-events: none;
 }
 .admin__menu .submenu .column {
diff --git a/dev/tools/grunt/configs/replace.js b/dev/tools/grunt/configs/replace.js
index bc45defaecc82658507f880ac90e553ef03a4398..704683f691c36ec8f5189b26feef77009bd0e57e 100644
--- a/dev/tools/grunt/configs/replace.js
+++ b/dev/tools/grunt/configs/replace.js
@@ -9,7 +9,7 @@
  * Replace task for backend migration
  */
 module.exports = {
-    example: {
+    escapeCalc: {
         src: ['<%= combo.autopath("backend","pub") %>/css/styles.css'], // source files array (supports minimatch)
         dest: '<%= combo.autopath("backend","pub") %>/css/override.less', // destination directory or file
         replacements: [{
diff --git a/dev/tools/grunt/configs/themes.js b/dev/tools/grunt/configs/themes.js
index 3d9729b9d09451cd766e9d4a12ad7afadc47bcfd..dd43ca186524d7377334b1d341cc6c5bdc93db35 100644
--- a/dev/tools/grunt/configs/themes.js
+++ b/dev/tools/grunt/configs/themes.js
@@ -46,8 +46,6 @@ module.exports = {
         files: [
             'css/styles-old',
             'css/styles',
-            'css/pages',
-            'css/admin',
             'css/styles-migration'
         ],
         dsl: 'less'
diff --git a/dev/tools/grunt/configs/watch.js b/dev/tools/grunt/configs/watch.js
index 786f5ab270bd02f61d2887beaa348028ab3ed059..f1a117ac8edb4dc079841f83c74edbb9c03f5b7f 100644
--- a/dev/tools/grunt/configs/watch.js
+++ b/dev/tools/grunt/configs/watch.js
@@ -24,7 +24,16 @@ var watchOptions = {
     "setup": {
         "files": "<%= path.less.setup %>/**/*.less",
         "tasks": "less:setup"
+    },
+    "backendMigration": {
+        "files": [
+            "<%= combo.autopath(\"backend\",\"pub\") %>/css/styles.css"
+        ],
+        "tasks": [
+            "replace:escapeCalc",
+            "less:override"
+        ]
     }
 };
 
-module.exports = _.extend(themeOptions, watchOptions);
\ No newline at end of file
+module.exports = _.extend(themeOptions, watchOptions);