diff --git a/components/lib/contextmenu/ContextMenuSub.vue b/components/lib/contextmenu/ContextMenuSub.vue
index ab33098b3..8b6b8a4c8 100755
--- a/components/lib/contextmenu/ContextMenuSub.vue
+++ b/components/lib/contextmenu/ContextMenuSub.vue
@@ -30,7 +30,7 @@
                         <template v-if="!templates.item">
                             <a v-ripple :href="getItemProp(processedItem, 'url')" :class="cx('itemLink')" :target="getItemProp(processedItem, 'target')" tabindex="-1" aria-hidden="true" v-bind="getPTOptions('itemLink', processedItem, index)">
                                 <component v-if="templates.itemicon" :is="templates.itemicon" :item="processedItem.item" :class="cx('itemIcon')" />
-                                <span v-else-if="getItemProp(processedItem, 'icon')" :class="[cx('icon'), getItemProp(processedItem, 'icon')]" v-bind="getPTOptions('itemIcon', processedItem, index)" />
+                                <span v-else-if="getItemProp(processedItem, 'icon')" :class="[cx('itemIcon'), getItemProp(processedItem, 'icon')]" v-bind="getPTOptions('itemIcon', processedItem, index)" />
                                 <span :id="getItemLabelId(processedItem)" :class="cx('itemLabel')" v-bind="getPTOptions('itemLabel', processedItem, index)">{{ getItemLabel(processedItem) }}</span>
                                 <template v-if="getItemProp(processedItem, 'items')">
                                     <component v-if="templates.submenuicon" :is="templates.submenuicon" :active="isItemActive(processedItem)" :class="cx('submenuIcon')" />
diff --git a/components/lib/contextmenu/style/ContextMenuStyle.js b/components/lib/contextmenu/style/ContextMenuStyle.js
index 461a048e5..9c65c834f 100644
--- a/components/lib/contextmenu/style/ContextMenuStyle.js
+++ b/components/lib/contextmenu/style/ContextMenuStyle.js
@@ -2,50 +2,43 @@ import BaseStyle from 'primevue/base/style';
 
 const theme = ({ dt }) => `
 .p-contextmenu {
-    padding: 0.25rem 0.25rem;
     background: ${dt('contextmenu.background')};
     color: ${dt('contextmenu.color')};
     border: 1px solid ${dt('contextmenu.border.color')};
-    border-radius: ${dt('border.radius.md')};
-    box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -2px rgba(0, 0, 0, 0.1);
+    border-radius: ${dt('contextmenu.border.radius')};
+    box-shadow: ${dt('contextmenu.shadow')};
     min-width: 12.5rem;
 }
 
 .p-contextmenu-root-list,
 .p-contextmenu-submenu {
     margin: 0;
-    padding: 0;
+    padding: ${dt('contextmenu.list.padding')};
     list-style: none;
     outline: 0 none;
+    display: flex;
+    flex-direction: column;
+    gap: ${dt('contextmenu.list.gap')};
 }
 
 .p-contextmenu-submenu {
     position: absolute;
     min-width: 100%;
     z-index: 1;
-    padding: 0.25rem 0.25rem;
     background: ${dt('contextmenu.background')};
     color: ${dt('contextmenu.color')};
     border: 1px solid ${dt('contextmenu.border.color')};
-    border-radius: ${dt('border.radius.md')};
-    box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -2px rgba(0, 0, 0, 0.1);
+    border-radius: ${dt('contextmenu.border.radius')};
+    box-shadow: ${dt('contextmenu.shadow')};
 }
 
 .p-contextmenu-item {
     position: relative;
-    margin: 2px 0;
-}
-
-.p-contextmenu-item:first-child {
-    margin-top: 0;
-}
-.p-contextmenu-item:last-child {
-    margin-bottom: 0;
 }
 
 .p-contextmenu-item-content {
-    transition: background-color ${dt('transition.duration')}, color ${dt('transition.duration')};
-    border-radius: ${dt('border.radius.sm')};
+    transition: background ${dt('transition.duration')}, color ${dt('transition.duration')};
+    border-radius: ${dt('contextmenu.item.border.radius')};
     color: ${dt('contextmenu.item.color')};
 }
 
@@ -57,7 +50,8 @@ const theme = ({ dt }) => `
     overflow: hidden;
     position: relative;
     color: inherit;
-    padding: 0.5rem 0.75rem;
+    padding: ${dt('contextmenu.item.padding')};
+    gap: ${dt('contextmenu.item.gap')};
     user-select: none;
 }
 
@@ -67,15 +61,14 @@ const theme = ({ dt }) => `
 
 .p-contextmenu-item-icon {
     color: ${dt('contextmenu.item.icon.color')};
-    margin-right: 0.5rem;
 }
 
 .p-contextmenu-submenu-icon {
-    color: ${dt('contextmenu.item.icon.color')};
+    color: ${dt('contextmenu.submenu.icon.color')};
     margin-left: auto;
-    font-size: 0.875rem;
-    width: 0.875rem;
-    height: 0.875rem;
+    font-size: ${dt('contextmenu.submenu.icon.size')};
+    width: ${dt('contextmenu.submenu.icon.size')};
+    height: ${dt('contextmenu.submenu.icon.size')};
 }
 
 .p-contextmenu-item.p-focus > .p-contextmenu-item-content {
@@ -83,9 +76,12 @@ const theme = ({ dt }) => `
     background: ${dt('contextmenu.item.focus.background')};
 }
 
-.p-contextmenu-item.p-focus > .p-contextmenu-item-content .p-contextmenu-item-icon,
+.p-contextmenu-item.p-focus > .p-contextmenu-item-content .p-contextmenu-item-icon {
+    color: ${dt('contextmenu.item.icon.focus.color')};
+}
+
 .p-contextmenu-item.p-focus > .p-contextmenu-item-content .p-contextmenu-submenu-icon {
-    color: ${dt('contextmenu.item.icon.hover.color')};
+    color: ${dt('contextmenu.submenu.icon.focus.color')};
 }
 
 .p-contextmenu-item:not(.p-disabled) > .p-contextmenu-item-content:hover {
@@ -93,24 +89,29 @@ const theme = ({ dt }) => `
     background: ${dt('contextmenu.item.focus.background')};
 }
 
-.p-contextmenu-item:not(.p-disabled) > .p-contextmenu-item-content:hover .p-contextmenu-item-icon,
+.p-contextmenu-item:not(.p-disabled) > .p-contextmenu-item-content:hover .p-contextmenu-item-icon {
+    color: ${dt('contextmenu.item.icon.focus.color')};
+}
+
 .p-contextmenu-item:not(.p-disabled) > .p-contextmenu-item-content:hover .p-contextmenu-submenu-icon {
-    color: ${dt('contextmenu.item.icon.hover.color')};
+    color: ${dt('contextmenu.submenu.icon.focus.color')};
 }
 
 .p-contextmenu-item-active > .p-contextmenu-item-content {
-    color: ${dt('contextmenu.item.focus.color')};
-    background: ${dt('contextmenu.item.focus.background')};
+    color: ${dt('contextmenu.item.active.color')};
+    background: ${dt('contextmenu.item.active.background')};
+}
+
+.p-contextmenu-item-active > .p-contextmenu-item-content .p-contextmenu-item-icon {
+    color: ${dt('contextmenu.item.icon.active.color')};
 }
 
-.p-contextmenu-item-active > .p-contextmenu-item-content .p-contextmenu-item-icon,
 .p-contextmenu-item-active > .p-contextmenu-item-content .p-contextmenu-submenu-icon {
-    color: ${dt('contextmenu.item.icon.hover.color')};
+    color: ${dt('contextmenu.submenu.icon.active.color')};
 }
 
 .p-contextmenu-separator {
     border-top: 1px solid  ${dt('contextmenu.separator.border.color')};
-    margin: 2px 0;
 }
 
 .p-contextmenu-enter-from,
diff --git a/components/lib/themes/aura/contextmenu/index.js b/components/lib/themes/aura/contextmenu/index.js
index e0539fecb..d7b71c572 100644
--- a/components/lib/themes/aura/contextmenu/index.js
+++ b/components/lib/themes/aura/contextmenu/index.js
@@ -2,19 +2,34 @@ export default {
     root: {
         background: '{content.background}',
         borderColor: '{content.border.color}',
-        color: '{content.color}'
+        color: '{content.color}',
+        borderRadius: '{content.border.radius}',
+        shadow: '{overlay.navigation.shadow}'
+    },
+    list: {
+        padding: '{navigation.list.padding}',
+        gap: '{navigation.list.gap}'
     },
     item: {
         focusBackground: '{navigation.item.focus.background}',
+        activeBackground: '{navigation.item.active.background}',
         color: '{navigation.item.color}',
         focusColor: '{navigation.item.focus.color}',
+        activeColor: '{navigation.item.active.color}',
+        padding: '{navigation.item.padding}',
+        borderRadius: '{navigation.item.border.radius}',
+        gap: '{navigation.item.gap}',
         icon: {
             color: '{navigation.item.icon.color}',
-            hoverColor: '{navigation.item.icon.hover.color}'
+            focusColor: '{navigation.item.icon.focus.color}',
+            focusColor: '{navigation.item.icon.active.color}'
         }
     },
-    submenuItem: {
-        color: '{navigation.submenu.color}'
+    submenuIcon: {
+        size: '{navigation.submenu.icon.size}',
+        color: '{navigation.submenu.icon.color}',
+        focusColor: '{navigation.submenu.icon.focus.color}',
+        focusColor: '{navigation.submenu.icon.active.color}'
     },
     separator: {
         borderColor: '{content.border.color}'
diff --git a/components/lib/themes/aura/menu/index.js b/components/lib/themes/aura/menu/index.js
index 360f22640..151cdea49 100644
--- a/components/lib/themes/aura/menu/index.js
+++ b/components/lib/themes/aura/menu/index.js
@@ -25,7 +25,7 @@ export default {
     submenuLabel: {
         padding: '{navigation.submenu.label.padding}',
         fontWeight: '{navigation.submenu.label.font.weight}',
-        bakcground: '{navigation.submenu.label.background.}',
+        background: '{navigation.submenu.label.background.}',
         color: '{navigation.submenu.label.color}'
     },
     separator: {
diff --git a/components/lib/themes/aura/tieredmenu/index.js b/components/lib/themes/aura/tieredmenu/index.js
index 903fd8bfc..03f508cdd 100644
--- a/components/lib/themes/aura/tieredmenu/index.js
+++ b/components/lib/themes/aura/tieredmenu/index.js
@@ -28,7 +28,7 @@ export default {
     submenuLabel: {
         padding: '{navigation.submenu.label.padding}',
         fontWeight: '{navigation.submenu.label.font.weight}',
-        bakcground: '{navigation.submenu.label.background.}',
+        background: '{navigation.submenu.label.background.}',
         color: '{navigation.submenu.label.color}'
     },
     submenuIcon: {
diff --git a/components/lib/themes/lara/contextmenu/index.js b/components/lib/themes/lara/contextmenu/index.js
index e0539fecb..03f508cdd 100644
--- a/components/lib/themes/lara/contextmenu/index.js
+++ b/components/lib/themes/lara/contextmenu/index.js
@@ -2,19 +2,40 @@ export default {
     root: {
         background: '{content.background}',
         borderColor: '{content.border.color}',
-        color: '{content.color}'
+        color: '{content.color}',
+        borderRadius: '{content.border.radius}',
+        shadow: '{overlay.navigation.shadow}'
+    },
+    list: {
+        padding: '{navigation.list.padding}',
+        gap: '{navigation.list.gap}'
     },
     item: {
         focusBackground: '{navigation.item.focus.background}',
+        activeBackground: '{navigation.item.active.background}',
         color: '{navigation.item.color}',
         focusColor: '{navigation.item.focus.color}',
+        activeColor: '{navigation.item.active.color}',
+        padding: '{navigation.item.padding}',
+        borderRadius: '{navigation.item.border.radius}',
+        gap: '{navigation.item.gap}',
         icon: {
             color: '{navigation.item.icon.color}',
-            hoverColor: '{navigation.item.icon.hover.color}'
+            focusColor: '{navigation.item.icon.focus.color}',
+            focusColor: '{navigation.item.icon.active.color}'
         }
     },
-    submenuItem: {
-        color: '{navigation.submenu.color}'
+    submenuLabel: {
+        padding: '{navigation.submenu.label.padding}',
+        fontWeight: '{navigation.submenu.label.font.weight}',
+        background: '{navigation.submenu.label.background.}',
+        color: '{navigation.submenu.label.color}'
+    },
+    submenuIcon: {
+        size: '{navigation.submenu.icon.size}',
+        color: '{navigation.submenu.icon.color}',
+        focusColor: '{navigation.submenu.icon.focus.color}',
+        focusColor: '{navigation.submenu.icon.active.color}'
     },
     separator: {
         borderColor: '{content.border.color}'
diff --git a/components/lib/themes/lara/tieredmenu/index.js b/components/lib/themes/lara/tieredmenu/index.js
index 903fd8bfc..d7b71c572 100644
--- a/components/lib/themes/lara/tieredmenu/index.js
+++ b/components/lib/themes/lara/tieredmenu/index.js
@@ -25,12 +25,6 @@ export default {
             focusColor: '{navigation.item.icon.active.color}'
         }
     },
-    submenuLabel: {
-        padding: '{navigation.submenu.label.padding}',
-        fontWeight: '{navigation.submenu.label.font.weight}',
-        bakcground: '{navigation.submenu.label.background.}',
-        color: '{navigation.submenu.label.color}'
-    },
     submenuIcon: {
         size: '{navigation.submenu.icon.size}',
         color: '{navigation.submenu.icon.color}',