diff --git a/Makefile b/Makefile
index 36388a436..cccbab07d 100644
--- a/Makefile
+++ b/Makefile
@@ -77,6 +77,6 @@ $(HTML_BUILD_DIR)/_static/style.css: extensions/odoo_theme/static/style.scss ext
 fast: SPHINXOPTS += -A collapse_menu=True
 fast: html
 
-static: $(HTML_BUILD_DIR)/static/style.css
+static: $(HTML_BUILD_DIR)/_static/style.css
 	cp -r extensions/odoo_theme/static/* $(HTML_BUILD_DIR)/_static/
 	cp -r static/* $(HTML_BUILD_DIR)/_static/
diff --git a/extensions/odoo_theme/static/scss/_variables.scss b/extensions/odoo_theme/static/scss/_variables.scss
index e442fcb6e..abf2769b0 100644
--- a/extensions/odoo_theme/static/scss/_variables.scss
+++ b/extensions/odoo_theme/static/scss/_variables.scss
@@ -249,7 +249,6 @@ $website-2x-prefix:                         "2x_";
 $o-ease:                                    cubic-bezier(.55,0,.1,1);
 
 // Paddings and margins
-
 $padding-xs:                                .5rem;
 $padding-s:                                 1rem;
 $padding-m:                                 2rem;
diff --git a/extensions/odoo_theme/static/style.scss b/extensions/odoo_theme/static/style.scss
index ad804131e..fcef11a86 100644
--- a/extensions/odoo_theme/static/style.scss
+++ b/extensions/odoo_theme/static/style.scss
@@ -277,8 +277,6 @@ header.o_main_header {
 
         }
     }
-    scrollbar-width: thin;
-    scrollbar-color: $o-violet-darker transparent;
 
     &::-webkit-scrollbar {
         width: 5px;
@@ -521,7 +519,7 @@ header.o_main_header {
                     }
 
                     .o_git_link {
-                        right: calc(#{$o-codecol-width} + $padding-l);
+                        right: calc(#{$o-codecol-width} + #{$padding-l});
                     }
 
                     section {
@@ -723,7 +721,7 @@ header.o_main_header {
 
                     &:after {
                         content: '#{$i-link}';
-                        font-family: icomoon !important;
+                        font-family: icomoon, sans-serif !important;
                         @include font-size($font-size-base);
                         margin: 0 0 0 .3rem;
                         visibility: hidden;
@@ -758,7 +756,7 @@ header.o_main_header {
             margin: 1px 0 24px 0;
 
             div[class^="highlight"] {
-                padding: 0px;
+                padding: 0;
                 border: none;
                 margin: 0;
             }
@@ -959,10 +957,6 @@ header.o_main_header {
             &.alert-go_to {
                 border-color: $o-violet;
                 background-color: $gray-lightest;
-                @include media-breakpoint-up(lg){
-                    display: inline-block;
-                    width: calc(50% - 1rem);
-                }
 
                 a {
                     color: $o-violet-dark;