diff --git a/packages/themes/src/presets/material/accordion/index.js b/packages/themes/src/presets/material/accordion/index.js
index bca6584b7..ccd3c50db 100644
--- a/packages/themes/src/presets/material/accordion/index.js
+++ b/packages/themes/src/presets/material/accordion/index.js
@@ -71,7 +71,7 @@ export default {
 }
 
 .p-accordionpanel:not(.p-disabled) .p-accordionheader:focus-visible {
-    background: ${dt('content.focus.background')};
+    background: ${dt('navigation.item.active.background')};
 }
 `
 };
diff --git a/packages/themes/src/presets/material/base/index.js b/packages/themes/src/presets/material/base/index.js
index 9dce0c7eb..a6ae700e2 100644
--- a/packages/themes/src/presets/material/base/index.js
+++ b/packages/themes/src/presets/material/base/index.js
@@ -188,7 +188,6 @@ export default {
                 content: {
                     background: '{surface.0}',
                     hoverBackground: '{surface.100}',
-                    focusBackground: '{surface.200}',
                     borderColor: '{surface.300}',
                     color: '{text.color}',
                     hoverColor: '{text.hover.color}'
@@ -290,8 +289,8 @@ export default {
                     filledBackground: '{surface.800}',
                     filledHoverBackground: '{surface.700}',
                     filledFocusBackground: '{surface.800}',
-                    borderColor: '{surface.700}',
-                    hoverBorderColor: '{surface.600}',
+                    borderColor: '{surface.600}',
+                    hoverBorderColor: '{surface.400}',
                     focusBorderColor: '{primary.color}',
                     invalidBorderColor: '{red.300}',
                     color: '{surface.0}',
@@ -302,13 +301,13 @@ export default {
                     floatLabelActiveColor: '{surface.400}',
                     floatLabelInvalidColor: '{red.300}',
                     iconColor: '{surface.400}',
-                    shadow: '0 0 #0000, 0 0 #0000, 0 1px 2px 0 rgba(18, 18, 23, 0.05)'
+                    shadow: 'none'
                 },
                 text: {
                     color: '{surface.0}',
                     hoverColor: '{surface.0}',
                     mutedColor: '{surface.400}',
-                    hoverMutedColor: '{surface.300}'
+                    hoverMutedColor: '{surface.400}'
                 },
                 content: {
                     background: '{surface.900}',
@@ -320,17 +319,17 @@ export default {
                 overlay: {
                     select: {
                         background: '{surface.900}',
-                        borderColor: '{surface.700}',
+                        borderColor: '{surface.900}',
                         color: '{text.color}'
                     },
                     popover: {
                         background: '{surface.900}',
-                        borderColor: '{surface.700}',
+                        borderColor: '{surface.900}',
                         color: '{text.color}'
                     },
                     modal: {
                         background: '{surface.900}',
-                        borderColor: '{surface.700}',
+                        borderColor: '{surface.900}',
                         color: '{text.color}'
                     }
                 },
@@ -344,7 +343,7 @@ export default {
                         selectedColor: '{highlight.color}',
                         selectedFocusColor: '{highlight.focus.color}',
                         icon: {
-                            color: '{surface.500}',
+                            color: '{surface.400}',
                             focusColor: '{surface.400}'
                         }
                     },
@@ -356,12 +355,12 @@ export default {
                 navigation: {
                     item: {
                         focusBackground: '{surface.800}',
-                        activeBackground: '{surface.800}',
+                        activeBackground: '{surface.700}',
                         color: '{text.color}',
                         focusColor: '{text.hover.color}',
                         activeColor: '{text.hover.color}',
                         icon: {
-                            color: '{surface.500}',
+                            color: '{surface.400}',
                             focusColor: '{surface.400}',
                             activeColor: '{surface.400}'
                         }
@@ -371,7 +370,7 @@ export default {
                         color: '{text.muted.color}'
                     },
                     submenuIcon: {
-                        color: '{surface.500}',
+                        color: '{surface.400}',
                         focusColor: '{surface.400}',
                         activeColor: '{surface.400}'
                     }
diff --git a/packages/themes/src/presets/material/fieldset/index.js b/packages/themes/src/presets/material/fieldset/index.js
index a5cc9e9ac..c2962d9a0 100644
--- a/packages/themes/src/presets/material/fieldset/index.js
+++ b/packages/themes/src/presets/material/fieldset/index.js
@@ -35,7 +35,7 @@ export default {
     },
     style: ({ dt }) => `
 .p-fieldset-toggle-button:focus-visible {
-    background: ${dt('content.focus.background')};
+    background: ${dt('navigation.item.active.background')};
 
 }
 `
diff --git a/packages/themes/src/presets/material/megamenu/index.js b/packages/themes/src/presets/material/megamenu/index.js
index 1368c1f2d..2f94086a8 100644
--- a/packages/themes/src/presets/material/megamenu/index.js
+++ b/packages/themes/src/presets/material/megamenu/index.js
@@ -77,7 +77,7 @@ export default {
     },
     style: ({ dt }) => `
 .p-megamenu-button:focus-visible {
-    background: ${dt('content.focus.background')};
+    background: ${dt('navigation.item.active.background')};
 }
 `
 };
diff --git a/packages/themes/src/presets/material/menubar/index.js b/packages/themes/src/presets/material/menubar/index.js
index 9a9e70ec7..25caa46fd 100644
--- a/packages/themes/src/presets/material/menubar/index.js
+++ b/packages/themes/src/presets/material/menubar/index.js
@@ -61,7 +61,7 @@ export default {
     },
     style: ({ dt }) => `
 .p-menubar-button:focus-visible {
-    background: ${dt('content.focus.background')};
+    background: ${dt('navigation.item.active.background')};
 }
 `
 };
diff --git a/packages/themes/src/presets/material/panelmenu/index.js b/packages/themes/src/presets/material/panelmenu/index.js
index 4f58f5186..97ac3175c 100644
--- a/packages/themes/src/presets/material/panelmenu/index.js
+++ b/packages/themes/src/presets/material/panelmenu/index.js
@@ -61,7 +61,7 @@ export default {
 }
 
 .p-accordionpanel:not(.p-disabled) .p-accordionheader:focus-visible {
-    background: ${dt('content.focus.background')};
+    background: ${dt('navigation.item.active.background')};
 }
 `
 };
diff --git a/packages/themes/src/presets/material/stepper/index.js b/packages/themes/src/presets/material/stepper/index.js
index 7b50de571..59272a266 100644
--- a/packages/themes/src/presets/material/stepper/index.js
+++ b/packages/themes/src/presets/material/stepper/index.js
@@ -59,7 +59,7 @@ export default {
     },
     style: ({ dt }) => `
 .p-step-header:focus-visible {
-    background: ${dt('content.focus.background')};
+    background: ${dt('navigation.item.active.background')};
 }
 }
 `
diff --git a/packages/themes/src/presets/material/tabs/index.js b/packages/themes/src/presets/material/tabs/index.js
index dc27fd0fa..8571f4f4a 100644
--- a/packages/themes/src/presets/material/tabs/index.js
+++ b/packages/themes/src/presets/material/tabs/index.js
@@ -71,11 +71,11 @@ export default {
 }
 
 .p-tab:not(.p-disabled):focus-visible {
-    background: ${dt('content.focus.background')};
+    background: ${dt('navigation.item.active.background')};
 }
 
 .p-tablist-nav-button:focus-visible {
-    background: ${dt('content.focus.background')};
+    background: ${dt('navigation.item.active.background')};
 }
 `
 };