diff --git a/extensions/odoo_theme/static/scss/bootstrap_overridden.scss b/extensions/odoo_theme/static/scss/bootstrap_overridden.scss
index 9ae8d9f5f..1cb0344fa 100644
--- a/extensions/odoo_theme/static/scss/bootstrap_overridden.scss
+++ b/extensions/odoo_theme/static/scss/bootstrap_overridden.scss
@@ -92,7 +92,7 @@ $accordion-button-color:                    $accordion-color !default;
 $accordion-button-active-color:             $accordion-button-color !default;
 $accordion-button-bg:                       $accordion-bg !default;
 $accordion-button-active-bg:                $accordion-button-bg !default;
-
+$accordion-button-focus-box-shadow:         transparent;
 $accordion-icon-transform:                  rotate(0deg) !default;
 
 //Alert
diff --git a/extensions/odoo_theme/static/style.scss b/extensions/odoo_theme/static/style.scss
index 74233779d..13ecfab9a 100644
--- a/extensions/odoo_theme/static/style.scss
+++ b/extensions/odoo_theme/static/style.scss
@@ -1006,8 +1006,14 @@ header {
 //------------------------------------------------------------------------------
 
 .o_spoiler {
-    border-color: tint-color($dark, 30%);
-    background-color: $o-accordion-bg;
+    $background: shift-color($o-accordion-bg, $alert-bg-scale);
+    $border: shift-color($o-accordion-bg, $alert-border-scale);
+    $color: shift-color($o-accordion-bg, $alert-color-scale);
+
+    @if (contrast-ratio($background, $color) < $min-contrast-ratio) {
+        $color: mix($o-accordion-bg, color-contrast($background), abs($alert-color-scale));
+    }
+    @include alert-variant($background, $border, $color);
 
     .accordion-button {
         &::after {
@@ -1020,17 +1026,23 @@ header {
     }
 
     .accordion-body {
-        #wrap & { // FIXME: Temporary workaround to take priority over pre-existing rules.
-            > *:first-child {
-                margin-top: $o-margin-s;
-            }
+        > *:first-child {
+            margin-top: $o-margin-s;
+        }
 
-            code, div[class^="highlight"] {
-                border-color: tint-color($dark, 50%);
+        > p , > ul {
+            margin-bottom: .5rem;
+        }
 
-                &:first-child:last-child {
-                    margin-bottom: 0;
-                }
+        > *:last-child {
+            margin-bottom: 0;
+        }
+
+        code, div[class^="highlight"] {
+            border-color: tint-color($dark, 50%);
+
+            &:first-child:last-child {
+                margin-bottom: 0;
             }
         }
     }