diff --git a/extensions/odoo_theme/layout_templates/language_switcher.html b/extensions/odoo_theme/layout_templates/language_switcher.html
index d26b063b2..dcbba4a0c 100644
--- a/extensions/odoo_theme/layout_templates/language_switcher.html
+++ b/extensions/odoo_theme/layout_templates/language_switcher.html
@@ -1,4 +1,4 @@
-<div class="o_languages me-2">
+<div class="o_languages me-3">
 	<div class="dropdown">
         {% if alternate_languages|length > 0 %}
             <button class="btn border dropdown-toggle"
diff --git a/extensions/odoo_theme/layout_templates/searchbox.html b/extensions/odoo_theme/layout_templates/searchbox.html
index dda32524b..03151214b 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-lg-start" role="search">
+<div id="searchbox" class="d-flex flex-grow-1 justify-content-stretch justify-content-lg-start pe-2" 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/layout_templates/version_switcher.html b/extensions/odoo_theme/layout_templates/version_switcher.html
index 1cdd79dcd..d26f1d67f 100644
--- a/extensions/odoo_theme/layout_templates/version_switcher.html
+++ b/extensions/odoo_theme/layout_templates/version_switcher.html
@@ -1,8 +1,8 @@
-<div class="o_versions row me-2">
-	<div class="col-4 col-form-label">
+<div class="o_versions row gx-2 me-3">
+	<div class="col col-form-label">
     	<label class="fw_bold small me-2">Version</label>
     </div>
-    <div class="col-8">
+    <div class="col">
         <div class="dropdown">
             {% if alternate_versions|length > 0 %}
                 <button class="btn border dropdown-toggle"