diff --git a/extensions/odoo_theme/static/scss/bootstrap_overridden.scss b/extensions/odoo_theme/static/scss/bootstrap_overridden.scss
index 5c46110c2..0535180cd 100644
--- a/extensions/odoo_theme/static/scss/bootstrap_overridden.scss
+++ b/extensions/odoo_theme/static/scss/bootstrap_overridden.scss
@@ -70,3 +70,10 @@ $accordion-button-bg:                       $accordion-bg !default;
 $accordion-button-active-bg:                $accordion-button-bg !default;
 
 $accordion-icon-transform:                  rotate(0deg) !default;
+
+//Alert
+$alert-border-width:                        3px;
+$alert-border-scale:                        0;
+$alert-border-radius:                       0 3px 3px 0;
+$alert-bg-scale:                            -87%;
+$alert-color-scale:                         40%;
diff --git a/extensions/odoo_theme/static/style.scss b/extensions/odoo_theme/static/style.scss
index ac050b112..2fd85d2b4 100644
--- a/extensions/odoo_theme/static/style.scss
+++ b/extensions/odoo_theme/static/style.scss
@@ -906,21 +906,8 @@ header {
 //------------------------------------------------------------------------------
 // Alerts
 //------------------------------------------------------------------------------
-// alert-info
-// alert-note
-// alert-tip
-// alert-warning
-// alert-danger
-// alert-example
-// alert-exercise
-// alert-go_to
-
         .alert {
-            position: relative;
-            display: inline-block;
-            border-radius: 0;
-            border-width: 0 0 0 3px;
-            width: 100%;
+            border-width: 0 0 0 $alert-border-width;
             @include font-size($font-size-secondary);
 
             code, div[class^="highlight"] {
@@ -932,6 +919,7 @@ header {
             > p , > ul {
                 margin-bottom: .5rem;
             }
+
             > *:last-child {
                 margin-bottom: 0;
             }
@@ -950,133 +938,88 @@ header {
                 }
             }
 
-            &.alert-info, &[class^="admonition"] {
-                border-color: tint-color($brand-info, 30%);
-                background-color: tint-color($brand-info, 85%);
-                color: shade-color($brand-info, 35%);
+            // Custom Admonitions
+            &[class^="admonition"] {
+                @extend .alert-info;
 
-                > .alert-title, > h3 {
-                    color: $brand-info;
-                    &:before {
-                        content: '#{$i-info}';
-                    }
+                code, div[class^="highlight"] {
+                    border-color: tint-color($info, 30%);
+                }
+            }
+
+            // Note
+            &.alert-primary {
+                > .alert-title:before, > h3:before {
+                    content: '#{$i-note}';
                 }
 
                 code, div[class^="highlight"] {
-                    border-color: tint-color($brand-info, 30%);
+                    border-color: tint-color($primary, 30%);
                 }
             }
 
-            &.alert-note {
-                border-color: shade-color($info, 30%);
-                background-color: $gray-lightest;
-                color: shade-color($info, 55%);
-
-                > .alert-title, > h3 {
-                    color: shade-color($info, 45%);
-                    &:before {
-                        content: '#{$i-note}';
-                    }
+            // See Also
+            &.alert-secondary {
+                > .alert-title:before, > h3:before {
+                    content: '#{$i-arrow-right}';
                 }
-            }
 
-            &.alert-tip, &.tip {
-                border-color: shade-color($color-alpha, 10%);
-                background-color: $gray-lightest;
-                color: shade-color($color-alpha, 55%);
-
-                > .alert-title, > h3 {
-                    color: shade-color($color-alpha, 40%);
-                    &:before {
-                        content: '#{$i-lightbulb}';
-                        @include font-size(1.2rem);
-                    }
-                }
-            }
-
-            &.alert-warning, &.warning {
-                border-color: $brand-warning;
-
-                > .alert-title, > h3 {
-                    color: shade-color($brand-warning, 10%);
-                    &:before {
-                        content: '#{$i-warning}';
-                    }
+                a {
+                    color: $secondary;
                 }
 
                 code, div[class^="highlight"] {
-                    border-color: tint-color($brand-warning, 50%);
+                    border-color: tint-color($secondary, 50%);
                 }
             }
 
-            &.alert-danger {
-                border-color: $danger;
-
-                > .alert-title, > h3 {
-                    color: darken($brand-danger, 20%);
-
-                    &:before {
-                        content: '#{$i-danger}';
-                    }
-                }
-
-                code, div[class^="highlight"] {
-                    border-color: tint-color($brand-danger, 50%);
+            // Tip
+            &.alert-tip {
+                background-color: $o-gray-bg;
+                > .alert-title:before, > h3:before {
+                    content: '#{$i-lightbulb}';
+                    @include font-size(1.2rem);
                 }
             }
 
-            &.alert-example {
-                border-color: tint-color($doc_example, 30%);
-                background-color: tint-color($doc_example, 90%);
-                color: shade-color($doc_example, 35%);
-
-                > .alert-title, > h3 {
-                    color: shade-color($doc_example, 35%);
-                }
-
+            // Example
+            &.alert-success {
                 > .alert-title:before, > h3:before {
                     content: '#{$i-knowledge}';
                 }
 
                 code, div[class^="highlight"] {
-                    border-color: tint-color($doc-example, 50%);
+                    border-color: tint-color($success, 50%);
                 }
             }
 
-            &.alert-exercise {
-                border-color: tint-color($doc_exercise, 30%);
-                background-color: tint-color($doc_exercise, 90%);
-                color: shade-color($doc_exercise, 35%);
-
-                > .alert-title, > h3 {
-                    color: shade-color($doc_exercise, 35%);
+            // Warning & Important
+            &.alert-warning {
+                > .alert-title:before, > h3:before {
+                    content: '#{$i-warning}';
                 }
+                code, div[class^="highlight"] {
+                    border-color: tint-color($warning, 50%);
+                }
+            }
 
+            // Danger
+            &.alert-danger {
+                > .alert-title:before, > h3:before {
+                    content: '#{$i-danger}';
+                }
+                code, div[class^="highlight"] {
+                    border-color: tint-color($danger, 50%);
+                }
+            }
+
+            // Exercises
+            &.alert-dark {
                 > .alert-title:before, > h3:before {
                     content: '#{$i-exercise}';
                 }
                 code, div[class^="highlight"] {
-                    border-color: tint-color($doc-exercise, 50%);
-                }
-            }
-
-            &.alert-go_to {
-                border-color: $o-violet;
-                background-color: $gray-lightest;
-
-                a {
-                    color: $o-violet-dark;
-                }
-
-                > .alert-title, > h3 {
-                    color: $o-violet-dark;
-                }
-
-                > .alert-title:before, > h3:before {
-                    content: '#{$i-arrow-right}';
-                }
-                code, div[class^="highlight"] {
-                    border-color: tint-color($o-violet, 50%);
+                    border-color: tint-color($dark, 50%);
                 }
             }
         }
diff --git a/extensions/odoo_theme/translator.py b/extensions/odoo_theme/translator.py
index 8b12e6acf..0a46f29eb 100644
--- a/extensions/odoo_theme/translator.py
+++ b/extensions/odoo_theme/translator.py
@@ -10,15 +10,12 @@ from sphinx.writers.html5 import HTML5Translator
 #         └── Odoo Translator
 
 ADMONITION_MAPPING = {
-    # ???: 'alert-success',
-
-    'note': 'alert-note',
-
-    'hint': 'alert-info',
+# The alert classes have been replaced by default BS classes to reduce number of scss lines.
+    'note': 'alert-primary',
 
     'tip': 'alert-tip',
 
-    'seealso': 'alert-go_to',
+    'seealso': 'alert-secondary',
 
     'warning': 'alert-warning',
     'attention': 'alert-warning',
@@ -28,8 +25,8 @@ ADMONITION_MAPPING = {
     'danger': 'alert-danger',
     'error': 'alert-danger',
 
-    'example': 'alert-example',
-    'exercise': 'alert-exercise',
+    'example': 'alert-success',
+    'exercise': 'alert-dark',
 }