diff --git a/addons/website/static/src/css/bootswatch/cyborg.fix.css b/addons/website/static/src/css/bootswatch/cyborg.fix.css
index 43c8e5770f9..e93b2aa8ded 100644
--- a/addons/website/static/src/css/bootswatch/cyborg.fix.css
+++ b/addons/website/static/src/css/bootswatch/cyborg.fix.css
@@ -9,4 +9,22 @@ ul.wizard li {
 }
 ul.wizard .chevron:before {
     border-left: 10px solid #222 !important;
+}
+.popover, .modal-content {
+    border: 1px solid rgba(200,200,200,0.5);
+}
+.close {
+    color: #fff;
+}
+.popover.bottom .arrow:after {
+    border-bottom-color: #333;
+}
+.popover.top .arrow:after {
+    border-top-color: #333;
+}
+.popover.left .arrow:after {
+    border-left-color: #333;
+}
+.popover.right .arrow:after {
+    border-right-color: #333;
 }
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/simplex.fix.css b/addons/website/static/src/css/bootswatch/simplex.fix.css
index c87f0de237b..5d1df525449 100644
--- a/addons/website/static/src/css/bootswatch/simplex.fix.css
+++ b/addons/website/static/src/css/bootswatch/simplex.fix.css
@@ -1,3 +1,6 @@
 #website-top-navbar [data-action="cancel"] {
     color: #fff;
+}
+.fa {
+    font-family: FontAwesome !important;
 }
\ No newline at end of file
diff --git a/addons/website/static/src/css/bootswatch/slate.fix.css b/addons/website/static/src/css/bootswatch/slate.fix.css
index a61f8d98338..c2e1a999b03 100644
--- a/addons/website/static/src/css/bootswatch/slate.fix.css
+++ b/addons/website/static/src/css/bootswatch/slate.fix.css
@@ -12,3 +12,10 @@ ul.wizard .chevron:before {
 ul.wizard li.text-primary {
     color: #fff;
 }
+.close {
+    color: #fff;
+}
+.popover  {
+    -webkit-box-shadow: 0px 0px 20px rgba(0,0,0,0.5);
+    box-shadow: 0px 0px 20px rgba(0,0,0,0.5);
+}
diff --git a/addons/website/static/src/css/bootswatch/yeti.fix.css b/addons/website/static/src/css/bootswatch/yeti.fix.css
index c87f0de237b..a2835886465 100644
--- a/addons/website/static/src/css/bootswatch/yeti.fix.css
+++ b/addons/website/static/src/css/bootswatch/yeti.fix.css
@@ -1,3 +1,6 @@
 #website-top-navbar [data-action="cancel"] {
     color: #fff;
+}
+.popover .close {
+    color: #fff;
 }
\ No newline at end of file
diff --git a/addons/website/views/themes.xml b/addons/website/views/themes.xml
index 1b1cf1fe4d3..82f5105adcd 100644
--- a/addons/website/views/themes.xml
+++ b/addons/website/views/themes.xml
@@ -268,6 +268,7 @@
     <template id="website.theme_spacelab" name="Spacelab" inherit_option_id="website.theme">
         <xpath expr="//link[@id='bootstrap_css']" position="replace">
             <link rel='stylesheet' href='/website/static/src/css/bootswatch/spacelab.min.css' t-ignore="true"/>
+            <link rel='stylesheet' href='/website/static/src/css/bootswatch/spacelab.fix.css' t-ignore="true"/>
         </xpath>
     </template>