diff --git a/addons/hr_attendance/static/src/scss/hr_attendance.scss b/addons/hr_attendance/static/src/scss/hr_attendance.scss
index c4086e885fe..5260fd99eb5 100644
--- a/addons/hr_attendance/static/src/scss/hr_attendance.scss
+++ b/addons/hr_attendance/static/src/scss/hr_attendance.scss
@@ -118,7 +118,7 @@
             padding-left: 14px;
             line-height: 1.5em;
             text-align: left;
-            color: $text-color;
+            color: $body-color;
             font-size: 1.6em;
             z-index: 1;
             box-shadow: inset 0 0 0 1px fade-out(black, 0.8);
diff --git a/addons/hr_org_chart/static/src/scss/hr_org_chart.scss b/addons/hr_org_chart/static/src/scss/hr_org_chart.scss
index b71fd72539e..ce1de55db0e 100644
--- a/addons/hr_org_chart/static/src/scss/hr_org_chart.scss
+++ b/addons/hr_org_chart/static/src/scss/hr_org_chart.scss
@@ -175,7 +175,7 @@
                 border-color: transparent;
                 padding: 0;
                 position: relative;
-                color: $text-color;
+                color: $body-color;
 
                 .o_org_chart_show_more {
                     line-height: 13px;
diff --git a/addons/mail/static/src/scss/followers.scss b/addons/mail/static/src/scss/followers.scss
index ae7b7ae3405..c0748f67a56 100644
--- a/addons/mail/static/src/scss/followers.scss
+++ b/addons/mail/static/src/scss/followers.scss
@@ -38,7 +38,7 @@
         .o_followers_follow_button {
             width: 85px;
             padding-right: 0;
-            color: $text-color;
+            color: $body-color;
             font-weight: bold;
 
             .o_follow, .o_followers_unfollow, .o_followers_following {
diff --git a/addons/mail/static/src/scss/mail_activity.scss b/addons/mail/static/src/scss/mail_activity.scss
index cff2778e075..c9763a025be 100644
--- a/addons/mail/static/src/scss/mail_activity.scss
+++ b/addons/mail/static/src/scss/mail_activity.scss
@@ -163,7 +163,7 @@
             li > ul.o_activity_log {
                 max-height: 300px;
                 overflow-y: auto;
-                color: $text-color;
+                color: $body-color;
 
                 li {
                     width: 100%;
diff --git a/addons/web/static/src/scss/kanban_view.scss b/addons/web/static/src/scss/kanban_view.scss
index 749c84d69fc..437ec25b864 100644
--- a/addons/web/static/src/scss/kanban_view.scss
+++ b/addons/web/static/src/scss/kanban_view.scss
@@ -122,7 +122,7 @@
                 }
             }
             .o_link_muted {
-                color: $text-color;
+                color: $body-color;
                 &:hover {
                     color: $brand-primary;
                     text-decoration: underline;
diff --git a/addons/web/static/src/scss/utils.scss b/addons/web/static/src/scss/utils.scss
index 1762e4d34d9..5c77bebd409 100644
--- a/addons/web/static/src/scss/utils.scss
+++ b/addons/web/static/src/scss/utils.scss
@@ -132,7 +132,7 @@
 // ------------------------------------------------------------------
 // Hovering effects
 // ------------------------------------------------------------------
-@mixin o-hover-text-color($default-color: $text-color, $hover-color: $link-color) {
+@mixin o-hover-text-color($default-color: $body-color, $hover-color: $link-color) {
     color: $default-color;
 
     &:hover, &:focus, &.focus {
@@ -221,7 +221,7 @@
     border: 1px solid transparent;
     border-bottom: none;
     vertical-align: top;
-    color: $text-color;
+    color: $body-color;
 
     &:hover {
         color: $headings-color;
@@ -288,7 +288,7 @@
     > a {
         margin: auto auto auto (-$link-padding-gap);
         padding: 3px $link-padding-gap;
-        color: $text-color;
+        color: $body-color;
         display: block;
 
         &:hover {
diff --git a/addons/web/static/src/scss/webclient.scss b/addons/web/static/src/scss/webclient.scss
index a3a007276e6..cb122b084f2 100644
--- a/addons/web/static/src/scss/webclient.scss
+++ b/addons/web/static/src/scss/webclient.scss
@@ -164,19 +164,19 @@ div.o_boolean_toggle {
     font-weight: $btn-font-weight;
 
     &.btn-secondary {
-        @include o-btn-link-variant($text-color, $headings-color);
+        @include o-btn-link-variant($body-color, $headings-color);
     }
     &.btn-success, &.text-success {
-        @include o-btn-link-variant($text-color, $brand-success);
+        @include o-btn-link-variant($body-color, $brand-success);
     }
     &.btn-warning, &.text-warning {
-        @include o-btn-link-variant($text-color, $brand-warning);
+        @include o-btn-link-variant($body-color, $brand-warning);
     }
     &.btn-danger, &.text-danger {
-        @include o-btn-link-variant($text-color, $brand-danger);
+        @include o-btn-link-variant($body-color, $brand-danger);
     }
     &.btn-info, &.text-info {
-        @include o-btn-link-variant($text-color, darken($brand-info, 20%));
+        @include o-btn-link-variant($body-color, darken($brand-info, 20%));
     }
 }
 
diff --git a/addons/web_editor/static/src/scss/web_editor.variables.scss b/addons/web_editor/static/src/scss/web_editor.variables.scss
index 0e65ea99afa..469c66d66cb 100644
--- a/addons/web_editor/static/src/scss/web_editor.variables.scss
+++ b/addons/web_editor/static/src/scss/web_editor.variables.scss
@@ -238,7 +238,7 @@ $color-white-25: rgba(white, 0.25) !default;
 $color-white-50: rgba(white, 0.5) !default;
 $color-white-75: rgba(white, 0.75) !default;
 
-@mixin o-create-color-classes($name, $color, $complementary: o-get-most-contrast($color, $text-color, #FFF), $content-color: $color) {
+@mixin o-create-color-classes($name, $color, $complementary: o-get-most-contrast($color, $body-color, #FFF), $content-color: $color) {
     .bg-#{$name} {
         background-color: $color;
         color: $complementary;
@@ -250,7 +250,7 @@ $color-white-75: rgba(white, 0.75) !default;
         color: $content-color;
     }
 }
-@mixin o-create-color-btn-classes($name, $color, $complementary: o-get-most-contrast($color, $text-color, #FFF), $border-color: darken($color, 5%)) {
+@mixin o-create-color-btn-classes($name, $color, $complementary: o-get-most-contrast($color, $body-color, #FFF), $border-color: darken($color, 5%)) {
     .btn-#{$name} {
         @include button-variant($complementary, $color, $border-color);
     }
diff --git a/addons/website_sale/static/src/scss/website_sale_backend.scss b/addons/website_sale/static/src/scss/website_sale_backend.scss
index 159921d5b01..b5cd1b3fbcb 100644
--- a/addons/website_sale/static/src/scss/website_sale_backend.scss
+++ b/addons/website_sale/static/src/scss/website_sale_backend.scss
@@ -55,7 +55,7 @@
 
             &.label-normal {
                 background-color: $gray-lighter;
-                color: $text-color;
+                color: $body-color;
             }
         }
     }
diff --git a/addons/website_sale/static/src/scss/website_sale_frontend.scss b/addons/website_sale/static/src/scss/website_sale_frontend.scss
index 049234ab7da..c119d090e15 100644
--- a/addons/website_sale/static/src/scss/website_sale_frontend.scss
+++ b/addons/website_sale/static/src/scss/website_sale_frontend.scss
@@ -13,7 +13,7 @@ $o-wsale-wizard-dot-active: $brand-primary;
 $o-wsale-wizard-dot-completed: $brand-success;
 
 $o-wsale-wizard-label-default: $text-muted;
-$o-wsale-wizard-label-active: $text-color;
+$o-wsale-wizard-label-active: $body-color;
 $o-wsale-wizard-label-completed: $state-success-text;
 
 .progress-wizard {
diff --git a/addons/website_theme_install/static/src/scss/website_theme_install.scss b/addons/website_theme_install/static/src/scss/website_theme_install.scss
index 114e7d061f4..bb4f5a49bc5 100644
--- a/addons/website_theme_install/static/src/scss/website_theme_install.scss
+++ b/addons/website_theme_install/static/src/scss/website_theme_install.scss
@@ -122,7 +122,7 @@
 
                 .o_column_title {
                     padding: 0;
-                    color: $text-color;
+                    color: $body-color;
                 }
 
                 &:hover, &.show {