diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php
index 72fa391aa7..a961a62ecb 100644
--- a/pandora_console/general/main_menu.php
+++ b/pandora_console/general/main_menu.php
@@ -98,6 +98,10 @@ echo '</div>';
 ?>
 <script type="text/javascript">
     $(document).ready(function() {
+        const menuTypeClass = '<?php echo $menuTypeClass; ?>';
+        if (menuTypeClass === 'classic' && menuTypeClass !== localStorage.getItem('menuType')) {
+            localStorage.setItem('menuType', 'classic');
+        }
         const tab = '<?php echo $tab_active; ?>';
 
         if (tab === 'management') {
@@ -443,8 +447,12 @@ echo '</div>';
          * @return (int) The position (in px).
          */
         function menu_calculate_top(index, item_height) {
-            const result = index * item_height;
-            return 133 + result;
+            const height_position = index * item_height;
+            const height_logo = $('.logo_green').outerHeight(true);
+            const height_tabs = $('#menu_tabs').outerHeight(true);
+            const padding_menu = parseInt($('.godmode').css('padding-top'));
+
+            return height_logo + height_tabs + padding_menu + height_position;
         }
     });
 </script>
diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php
index 352ef5a4e0..20e66149b3 100644
--- a/pandora_console/include/functions_menu.php
+++ b/pandora_console/include/functions_menu.php
@@ -288,7 +288,7 @@ function menu_print_menu(&$menu)
                 $submenu_output .= '<li title="'.$sub['id'].'" id="'.str_replace(' ', '_', $sub['id']).'" class="'.$class.'">';
 
                 if (isset($sub['subtype']) && $sub['subtype'] == 'nolink') {
-                    $submenu_output .= '<div class=" SubNoLink '.$sub_tree_class.'"><span class="w70p span_has_menu_text">'.$sub['text'].'</span><div class="w29p arrow_menu_down"></div></div>';
+                    $submenu_output .= '<div class=" SubNoLink '.$sub_tree_class.'"><span class="w70p span_has_menu_text">'.$sub['text'].'</span><div class="w21p arrow_menu_down"></div></div>';
                 } else if (isset($sub['subtype']) && $sub['subtype'] == 'new_blank') {
                     $submenu_output .= '<a href="'.$subsec2.'" target="_blank"><div class="'.$sub_tree_class.'">'.$sub['text'].'</div></a>';
                 } else {
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 96532559d7..fedb65ea9f 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -635,6 +635,10 @@ select:-internal-list-box {
   width: 20%;
 }
 
+.w21p {
+  width: 21%;
+}
+
 .w22p {
   width: 22%;
 }