diff --git a/extensions/odoo_theme/layout_templates/language_switcher.html b/extensions/odoo_theme/layout_templates/language_switcher.html
index 326a1db16..6ec6c21db 100644
--- a/extensions/odoo_theme/layout_templates/language_switcher.html
+++ b/extensions/odoo_theme/layout_templates/language_switcher.html
@@ -3,7 +3,7 @@
         <button class="btn border dropdown-toggle" id="languages" data-bs-toggle="dropdown">
             {{ language }} {# The current language #}
         </button>
-        <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="languages">
+        <ul class="dropdown-menu" aria-labelledby="languages">
             {% for alternate_language, language_code, url in alternate_languages %}
                 <li><a class="dropdown-item" href="{{ url }}">{{ alternate_language }}</a></li>
             {% endfor %}
diff --git a/extensions/odoo_theme/pygments_override.py b/extensions/odoo_theme/pygments_override.py
index 07e472628..1cec09da8 100644
--- a/extensions/odoo_theme/pygments_override.py
+++ b/extensions/odoo_theme/pygments_override.py
@@ -27,6 +27,9 @@ class OdooStyle(Style):
         Keyword.Constant: 'bold',
         Name.Builtin: '#2c2cff',
         Name.Function: 'bold italic',
+        Name.Class: "bold #0000FF",
+        Name.Namespace: "bold #0000FF",
+        Name.Exception: 'bg:#e3d2d2 #a61717',
         Name.Variable: 'bold #2c2cff',
         Name.Attribute: '#2c2cff',
         Name.Tag: "bold #008000",
diff --git a/extensions/odoo_theme/static/scss/bootstrap_overridden.scss b/extensions/odoo_theme/static/scss/bootstrap_overridden.scss
index 72e5ea130..6ddb6c608 100644
--- a/extensions/odoo_theme/static/scss/bootstrap_overridden.scss
+++ b/extensions/odoo_theme/static/scss/bootstrap_overridden.scss
@@ -59,6 +59,7 @@ $display-line-height:                       1;
 // For each of Bootstrap's buttons, define text, background, and border color.
 
 $btn-font-weight:                           $fw_semibold;
+$btn-focus-box-shadow:                      0 0 0 transparent;
 
 // Badges
 
@@ -106,3 +107,6 @@ $list-group-border-color:                   $card-border-color;
 
 $nav-pills-link-active-color:               #fff;
 $nav-pills-link-active-bg:                  o-color('o-color-2');
+
+// Dropdowns
+$dropdown-min-width:                        4.5rem;
\ No newline at end of file
diff --git a/extensions/odoo_theme/static/style.scss b/extensions/odoo_theme/static/style.scss
index 6cd5b1444..dacb370f0 100644
--- a/extensions/odoo_theme/static/style.scss
+++ b/extensions/odoo_theme/static/style.scss
@@ -115,25 +115,42 @@ header.o_main_header{
         }
 
         > .toctree-l1 {
-            > a:before {
+            &[class^="o_menu_"] > .o_toc_entry_wrapper > i:before {
                 @include inline-icomoon($i-doc-apps, 0 1rem 0 -30px);
             }
-            &.o_menu_applications > a:before{
+            &.o_menu_applications > .o_toc_entry_wrapper > i:before{
                 content:'#{$i-doc-apps}';
             }
-            &.o_menu_administration > a:before{
+            &.o_menu_administration > .o_toc_entry_wrapper > i:before{
                 content:'#{$i-doc-admin}';
             }
-            &.o_menu_developer > a:before{
+            &.o_menu_developer > .o_toc_entry_wrapper > i:before{
                 content:'#{$i-doc-dev}';
             }
-            &.o_menu_services > a:before{
+            &.o_menu_services > .o_toc_entry_wrapper > i:before{
                 content:'#{$i-doc-services}';
             }
-            &.o_menu_contributing > a:before{
+            &.o_menu_contributing > .o_toc_entry_wrapper > i:before{
                 content:'#{$i-doc-contribute}';
             }
 
+            .o_toc_entry_wrapper {
+                display: flex;
+                align-items: center;
+            }
+
+        }
+        > .toctree-l2 {
+            .o_toc_entry_wrapper {
+                > i[class^="i-"] {
+                    transition: rotate .3s;
+
+                    &[aria-expanded="true"]{
+                        transform: rotate(90deg);
+                    }
+
+                }
+            }
         }
 
     }
@@ -620,7 +637,7 @@ header.o_main_header{
                 }
             }
         }
-        .active > a{
+        .o_active_toc_entry > a {
             font-weight: $fw_bold;
         }
     }