diff --git a/src/app/core/admin/import-browse/import-browse.component.scss b/src/app/core/admin/import-browse/import-browse.component.scss
index 7b215cd38..48ccd5f85 100644
--- a/src/app/core/admin/import-browse/import-browse.component.scss
+++ b/src/app/core/admin/import-browse/import-browse.component.scss
@@ -333,7 +333,7 @@ color: white;
 }
 
 .facet-advanced-options-link {
-    margin-top: 7px;
+    margin: 7px;
     color: #448aff;
 }
 
diff --git a/src/app/core/base/base.component.scss b/src/app/core/base/base.component.scss
index fced607f5..9b86a8b2d 100644
--- a/src/app/core/base/base.component.scss
+++ b/src/app/core/base/base.component.scss
@@ -24,6 +24,7 @@
 .user {
   font-size: 12px;
   letter-spacing: 0.4px;
+  color: var(--regular-white-color);
 }
 .arrow-button {
   margin-left: -13px !important;
@@ -92,6 +93,23 @@
     display: flex;
     align-items: center;
     // gap: 6px;
+
+    .user-button.mat-mdc-icon-button {
+      --mat-icon-button-icon-size: 30px;
+      color: var(--regular-white-color);
+
+      ::ng-deep .mat-icon {
+        color: var(--regular-white-color);
+        height: 30px !important;
+        width: 30px !important;
+      }
+
+      ::ng-deep svg {
+        fill: var(--regular-white-color);
+        height: 30px !important;
+        width: 30px !important;
+      }
+    }
   }
 
   .mat-icon,
@@ -100,7 +118,9 @@
     width: 30px;
     margin-bottom: -10px;
     line-height: unset;
+    color: white;
   }
+
   ::ng-deep svg {
     height: 30px;
     width: 30px;
@@ -163,7 +183,7 @@
 }
 
 .login-link {
-  color: white;
+  color: white !important;
   font-size: 16px;
   text-decoration: none;
 }
diff --git a/src/app/core/facets-manager/facets-manager.component.scss b/src/app/core/facets-manager/facets-manager.component.scss
index e0f60a42d..0affd0c42 100644
--- a/src/app/core/facets-manager/facets-manager.component.scss
+++ b/src/app/core/facets-manager/facets-manager.component.scss
@@ -67,25 +67,27 @@
 }
 
 .include {
-    ::ng-deep .mat-checkbox-frame {
-        border-color: var(--include-checkbox-border-color);
+    ::ng-deep .mdc-checkbox__background {
+        border-color: var(--include-checkbox-border-color) !important;
     }
 
-    ::ng-deep &.mat-checkbox-indeterminate.mat-accent .mat-checkbox-background,
-    ::ng-deep &.mat-checkbox-checked.mat-accent .mat-checkbox-background {
-        background-color: var(--include-checkbox-bg-color);
+    ::ng-deep &.mat-mdc-checkbox-checked .mdc-checkbox__background,
+    ::ng-deep &.mat-mdc-checkbox-indeterminate .mdc-checkbox__background {
+        background-color: var(--include-checkbox-bg-color) !important;
+        border-color: var(--include-checkbox-bg-color) !important;
     }
 }
 
 .exclude {
-    margin-left: 5px;
-    ::ng-deep .mat-checkbox-frame {
-        border-color: var(--exclude-checkbox-border-color);
+    margin-left: 2px;
+    ::ng-deep .mdc-checkbox__background {
+        border-color: var(--exclude-checkbox-border-color) !important;
     }
 
-    ::ng-deep &.mat-checkbox-indeterminate.mat-accent .mat-checkbox-background,
-    ::ng-deep &.mat-checkbox-checked.mat-accent .mat-checkbox-background {
-        background-color: var(--exclude-checkbox-bg-color);
+    ::ng-deep &.mat-mdc-checkbox-checked .mdc-checkbox__background,
+    ::ng-deep &.mat-mdc-checkbox-indeterminate .mdc-checkbox__background {
+        background-color: var(--exclude-checkbox-bg-color) !important;
+        border-color: var(--exclude-checkbox-bg-color) !important;
     }
 }
 
@@ -100,6 +102,7 @@
 .facet-advanced-options-link {
     margin-top: 7px;
     color: var(--link-primary-color);
+    margin-left: 10px;
 }
 
 .facet-actions {
diff --git a/src/app/core/substance-text-search/substance-text-search.component.scss b/src/app/core/substance-text-search/substance-text-search.component.scss
index 364a2d235..4d744da24 100644
--- a/src/app/core/substance-text-search/substance-text-search.component.scss
+++ b/src/app/core/substance-text-search/substance-text-search.component.scss
@@ -107,6 +107,20 @@ form {
   }
 }
 
+.search-button,
+.close-button,
+.activate-search-button {
+  color: var(--regular-white-color);
+
+  ::ng-deep .mat-icon {
+    color: var(--regular-white-color);
+
+    svg {
+      fill: var(--regular-white-color);
+    }
+  }
+}
+
 .close-button {
   display: none !important;
   width: 0;
diff --git a/src/app/fda/adverse-event/adverse-events-browse/adverse-events-browse.component.scss b/src/app/fda/adverse-event/adverse-events-browse/adverse-events-browse.component.scss
index e69de29bb..3ba1dcd72 100644
--- a/src/app/fda/adverse-event/adverse-events-browse/adverse-events-browse.component.scss
+++ b/src/app/fda/adverse-event/adverse-events-browse/adverse-events-browse.component.scss
@@ -0,0 +1,5 @@
+:host ::ng-deep .mat-mdc-tab-list .mat-mdc-tab,
+:host ::ng-deep .mat-tab-list .mat-tab-label {
+  flex-grow: 0 !important;
+  flex-shrink: 0 !important;
+}
diff --git a/src/app/fda/application/applications-browse/applications-browse.component.scss b/src/app/fda/application/applications-browse/applications-browse.component.scss
index 9ce71ba89..0278f81aa 100644
--- a/src/app/fda/application/applications-browse/applications-browse.component.scss
+++ b/src/app/fda/application/applications-browse/applications-browse.component.scss
@@ -562,17 +562,20 @@
   }
 }
 
-.mat-card-title, .facet-value {
+.mat-card-title, .mat-mdc-card-title, .facet-value {
   display: flex;
+  justify-content: space-between;
+  margin-left: 20px;
   box-sizing: border-box;
-  width: 100%;
+  width: 98%;
   flex-direction: row;
   align-items: center;
   white-space: nowrap;
 }
 
-.mat-card-title {
+.mat-card-title, .mat-mdc-card-title {
   white-space: normal;
+  flex-wrap: wrap;
 
   .substance-name {
     color: var(--link-primary-color);
diff --git a/src/app/fda/product/product-details/product-details/product-details.component.scss b/src/app/fda/product/product-details/product-details/product-details.component.scss
index 72f3a36ba..46e7c5d7a 100644
--- a/src/app/fda/product/product-details/product-details/product-details.component.scss
+++ b/src/app/fda/product/product-details/product-details/product-details.component.scss
@@ -546,36 +546,44 @@ table.blueTable tfoot .links a{
 }
 
 /* TAB STYLE BEGIN */
+:host ::ng-deep .mat-mdc-tab-list .mat-mdc-tab,
 :host ::ng-deep .mat-tab-list .mat-tab-label {
+  flex-grow: 0 !important;
+  flex-shrink: 0 !important;
   min-width: 200px;
   max-width: 2000px;
   height: 35px;
   padding-top: 5px;
   margin-right: 7px;
-  text-align: top;
   color: #393939;
   opacity: 1 !important;
   border-radius: 10px 10px 0px 0px;
   background-color: var(--regular-lightgray-color-2);
-  padding-top: -10px;
 }
 
+:host ::ng-deep .mat-mdc-tab .mdc-tab__text-label,
 :host ::ng-deep .mat-tab-label-content {
   margin-top: -5px;
 }
 
+:host ::ng-deep .mat-mdc-tab-header,
 :host ::ng-deep .mat-tab-header {
   margin-top: -10px; /* tab margin*/
   border-bottom: 1px solid rgb(205, 201, 201);
 }
 
+:host ::ng-deep .mat-mdc-tab-list .mat-mdc-tab.mdc-tab--active,
 :host ::ng-deep .mat-tab-list .mat-tab-labels .mat-tab-label-active {
   background-color: var(--tabstyle-bg-color-7);
   color: #FFFFFF;
   font-weight: bold;
-  padding-top: -10px;
 }
 
+:host ::ng-deep .mat-mdc-tab.mdc-tab--active .mdc-tab__text-label {
+  color: #FFFFFF;
+}
+
+:host ::ng-deep .mdc-tab-indicator,
 :host ::ng-deep .mat-ink-bar {
   display: none !important;
 }
diff --git a/src/app/fda/product/products-browse/products-browse.component.scss b/src/app/fda/product/products-browse/products-browse.component.scss
index a5eedcdd2..42dc3af17 100644
--- a/src/app/fda/product/products-browse/products-browse.component.scss
+++ b/src/app/fda/product/products-browse/products-browse.component.scss
@@ -637,6 +637,7 @@
 
 .facet-advanced-options-link {
   margin-top: 7px;
+  margin-left: 10px;
   color: #448aff;
 }