diff --git a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html
index 47674025ca..1e8524e5ec 100644
--- a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html
+++ b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html
@@ -1,3 +1,3 @@
 <div class="mt-2 mb-2">
-  <span class="text-muted">{{'submission.workflow.tasks.generic.submitter' | translate}} : <span class="badge badge-light">{{(submitter$ | async)?.name}}</span></span>
+  <span class="text-muted">{{'submission.workflow.tasks.generic.submitter' | translate}} : <span class="badge badge-info">{{(submitter$ | async)?.name}}</span></span>
 </div>
diff --git a/src/app/shared/object-list/type-badge/type-badge.component.html b/src/app/shared/object-list/type-badge/type-badge.component.html
index 18aeeb4bca..0c2bd7544e 100644
--- a/src/app/shared/object-list/type-badge/type-badge.component.html
+++ b/src/app/shared/object-list/type-badge/type-badge.component.html
@@ -1,3 +1,3 @@
 <div *ngIf="typeMessage">
-  <span class="badge badge-light">{{ typeMessage | translate }}</span>
+  <span class="badge badge-info">{{ typeMessage | translate }}</span>
 </div>
diff --git a/src/styles/_bootstrap_variables.scss b/src/styles/_bootstrap_variables.scss
index 58f599c516..4c631a294a 100644
--- a/src/styles/_bootstrap_variables.scss
+++ b/src/styles/_bootstrap_variables.scss
@@ -12,12 +12,8 @@ $image-path: "../assets/images" !default;
 
 /** Bootstrap Variables **/
 /* Colors */
-$gray-base: #000 !default;
-$gray-900: lighten($gray-base, 13.5%) !default; // #222
-$gray-800: lighten($gray-base, 26.6%) !default; // #444
-$gray-700: lighten($gray-base, 46.6%) !default; // #777
-$gray-600: lighten($gray-base, 73.3%) !default; // #bbb
-$gray-100: lighten($gray-base, 93.5%) !default; // #eee
+$gray-700: #495057 !default;  // Bootstrap $gray-700
+$gray-100: #f8f9fa !default;  //           $gray-100
 
 /* Reassign color vars to semantic color scheme */
 $blue:   #2B4E72 !default;
diff --git a/src/themes/custom/styles/_theme_sass_variable_overrides.scss b/src/themes/custom/styles/_theme_sass_variable_overrides.scss
index 9f69b17ebd..f1387aa619 100644
--- a/src/themes/custom/styles/_theme_sass_variable_overrides.scss
+++ b/src/themes/custom/styles/_theme_sass_variable_overrides.scss
@@ -5,12 +5,8 @@
 
 // $font-family-sans-serif:      -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
 //
-// $gray-base: #000 !default;
-// $gray-900: lighten($gray-base, 13.5%) !default; // #222
-// $gray-800: lighten($gray-base, 26.6%) !default; // #444
-// $gray-700: lighten($gray-base, 46.6%) !default; // #777
-// $gray-600: lighten($gray-base, 73.3%) !default; // #bbb
-// $gray-100: lighten($gray-base, 93.5%) !default; // #eee
+// $gray-700: #495057 !default;  // Bootstrap $gray-700
+// $gray-100: #f8f9fa !default;  //           $gray-100
 //
 // $blue:   #2B4E72 !default;
 // $green:  #94BA65 !default;
diff --git a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
index 70aa0b1850..9257bc46dd 100644
--- a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
@@ -6,10 +6,6 @@
 @import url('https://fonts.googleapis.com/css2?family=Nunito:ital,wght@0,200;0,300;0,400;0,600;0,700;0,800;1,200;1,300;1,400;1,600;1,700;1,800&display=swap');
 
 $font-family-sans-serif: 'Nunito', -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-$gray-100: #e8ebf3 !default;
-$gray-400: #ced4da !default;
-$gray-600: #959595 !default;
-$gray-800: #444444 !default;
 
 $navbar-dark-color: #FFFFFF;
 
@@ -21,10 +17,13 @@ $yellow: #ec9433 !default;
 $red: #CF4444 !default;
 $dark: #43515f !default;
 
-$body-color: $gray-800 !default;
+$gray-800: #343a40 !default;
+$gray-400: #ced4da !default;
+$gray-100: #f8f9fa !default;
 
-$table-accent-bg:             $gray-100 !default;
-$table-hover-bg:              $gray-400 !default;
+$body-color: $gray-800 !default;                    // Bootstrap $gray-800
+
+$table-accent-bg: $gray-100 !default;   // Bootstrap $gray-100
+$table-hover-bg: $gray-400 !default;   // Bootstrap $gray-400
 
 $yiq-contrasted-threshold:  170 !default;
-