diff --git a/extensions/odoo_theme/layout_templates/header.html b/extensions/odoo_theme/layout_templates/header.html
index 6c11dcafe..11bff777a 100644
--- a/extensions/odoo_theme/layout_templates/header.html
+++ b/extensions/odoo_theme/layout_templates/header.html
@@ -6,7 +6,7 @@
       </a>
 </div>
 {% include "layout_templates/searchbox.html" %}
-<div class="d-none d-md-flex">
+<div class="d-none d-lg-flex">
     {#{% if alternate_languages %}#}
         {% include "layout_templates/language_switcher.html" %}
     {#{% endif %}#}
diff --git a/extensions/odoo_theme/layout_templates/searchbox.html b/extensions/odoo_theme/layout_templates/searchbox.html
index 27f0f459b..dda32524b 100644
--- a/extensions/odoo_theme/layout_templates/searchbox.html
+++ b/extensions/odoo_theme/layout_templates/searchbox.html
@@ -1,4 +1,4 @@
-<div id="searchbox" class="d-flex flex-grow-1 justify-content-end justify-content-md-start" role="search">
+<div id="searchbox" class="d-flex flex-grow-1 justify-content-end justify-content-lg-start" role="search">
     <form class="o_search" action="{{ pathto('search') }}" method="get">
         <input type="text" name="q" id="q" class="form-control rounded-pill" placeholder="What are you looking for?">
         <input type="hidden" name="area" value="default">
diff --git a/extensions/odoo_theme/static/style.scss b/extensions/odoo_theme/static/style.scss
index 273f59eb4..8718e6191 100644
--- a/extensions/odoo_theme/static/style.scss
+++ b/extensions/odoo_theme/static/style.scss
@@ -38,22 +38,27 @@ header.o_main_header{
     right: 0;
     background-color: $o-header-white;
     z-index: 10;
-    padding-right: 3rem;
+    @include media-breakpoint-up(lg) {
+        padding-right: 3rem;
+    }
     .o_logo_wrapper {
-        @include media-breakpoint-up(lg) {
+        padding: 0 1rem;
+        > .o_logo {
+            img {
+                margin-bottom: -2px;
+                vertical-align: baseline;
+            }
+            span {
+                @include font-size($font-size-base);
+                color: $o-violet;
+            }
+        }
+        @include media-breakpoint-up(xl) {
             width: $o-side-nav-width;
+        }
+        @include media-breakpoint-up(lg) {
             padding-left: 3rem;
             margin-right: 3rem;
-            > .o_logo {
-                img {
-                    margin-bottom: -2px;
-                    vertical-align: baseline;
-                }
-                span {
-                    @include font-size($font-size-base);
-                    color: $o-violet;
-                }
-            }
         }
     }
     .o_search {
@@ -283,6 +288,11 @@ header.o_main_header{
     margin-top: $o-header-height;
     display: flex;
     justify-content: space-between;
+    padding: 0 1rem;
+
+    @include media-breakpoint-up(lg) {
+        padding: 0;
+    }
 
     main {
         position: relative;