diff --git a/public/themes/luna-amber/theme.css b/public/themes/luna-amber/theme.css
index 4875d9672..2df76d0e5 100644
--- a/public/themes/luna-amber/theme.css
+++ b/public/themes/luna-amber/theme.css
@@ -1567,10 +1567,10 @@ body .p-panel .p-panel-titlebar .p-panel-titlebar-icon {
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
-  -moz-transition: color 0.2s, box-shadow 0.2s;
-  -o-transition: color 0.2s, box-shadow 0.2s;
-  -webkit-transition: color 0.2s, box-shadow 0.2s;
-  transition: color 0.2s, box-shadow 0.2s;
+  -moz-transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
+  -o-transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
+  -webkit-transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
+  transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
 }
 body .p-panel .p-panel-titlebar .p-panel-titlebar-icon:hover {
   color: #dedede;
@@ -3468,28 +3468,28 @@ body .p-slidemenu .p-menuitem-link .p-menuitem-icon {
   color: #dedede;
   margin-right: 0.5em;
 }
-body .p-menu .p-menuitem-link:hover,
-body .p-menubar .p-menuitem-link:hover,
-body .p-tieredmenu .p-menuitem-link:hover,
-body .p-contextmenu .p-menuitem-link:hover,
-body .p-megamenu .p-menuitem-link:hover,
-body .p-slidemenu .p-menuitem-link:hover {
+body .p-menu .p-menuitem-link:not(.p-disabled):hover,
+body .p-menubar .p-menuitem-link:not(.p-disabled):hover,
+body .p-tieredmenu .p-menuitem-link:not(.p-disabled):hover,
+body .p-contextmenu .p-menuitem-link:not(.p-disabled):hover,
+body .p-megamenu .p-menuitem-link:not(.p-disabled):hover,
+body .p-slidemenu .p-menuitem-link:not(.p-disabled):hover {
   background-color: #4c4c4c;
 }
-body .p-menu .p-menuitem-link:hover .p-menuitem-text,
-body .p-menubar .p-menuitem-link:hover .p-menuitem-text,
-body .p-tieredmenu .p-menuitem-link:hover .p-menuitem-text,
-body .p-contextmenu .p-menuitem-link:hover .p-menuitem-text,
-body .p-megamenu .p-menuitem-link:hover .p-menuitem-text,
-body .p-slidemenu .p-menuitem-link:hover .p-menuitem-text {
+body .p-menu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-menubar .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-tieredmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-contextmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-megamenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-slidemenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
   color: #dedede;
 }
-body .p-menu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-menubar .p-menuitem-link:hover .p-menuitem-icon,
-body .p-tieredmenu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-contextmenu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-megamenu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-slidemenu .p-menuitem-link:hover .p-menuitem-icon {
+body .p-menu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-menubar .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-tieredmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-contextmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-megamenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-slidemenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon {
   color: #dedede;
 }
 body .p-menu .p-menuitem-link:focus,
diff --git a/public/themes/luna-blue/theme.css b/public/themes/luna-blue/theme.css
index 4f5ed7a92..5f7dd8413 100644
--- a/public/themes/luna-blue/theme.css
+++ b/public/themes/luna-blue/theme.css
@@ -1567,10 +1567,10 @@ body .p-panel .p-panel-titlebar .p-panel-titlebar-icon {
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
-  -moz-transition: color 0.2s, box-shadow 0.2s;
-  -o-transition: color 0.2s, box-shadow 0.2s;
-  -webkit-transition: color 0.2s, box-shadow 0.2s;
-  transition: color 0.2s, box-shadow 0.2s;
+  -moz-transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
+  -o-transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
+  -webkit-transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
+  transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
 }
 body .p-panel .p-panel-titlebar .p-panel-titlebar-icon:hover {
   color: #dedede;
@@ -3468,28 +3468,28 @@ body .p-slidemenu .p-menuitem-link .p-menuitem-icon {
   color: #dedede;
   margin-right: 0.5em;
 }
-body .p-menu .p-menuitem-link:hover,
-body .p-menubar .p-menuitem-link:hover,
-body .p-tieredmenu .p-menuitem-link:hover,
-body .p-contextmenu .p-menuitem-link:hover,
-body .p-megamenu .p-menuitem-link:hover,
-body .p-slidemenu .p-menuitem-link:hover {
+body .p-menu .p-menuitem-link:not(.p-disabled):hover,
+body .p-menubar .p-menuitem-link:not(.p-disabled):hover,
+body .p-tieredmenu .p-menuitem-link:not(.p-disabled):hover,
+body .p-contextmenu .p-menuitem-link:not(.p-disabled):hover,
+body .p-megamenu .p-menuitem-link:not(.p-disabled):hover,
+body .p-slidemenu .p-menuitem-link:not(.p-disabled):hover {
   background-color: #4c4c4c;
 }
-body .p-menu .p-menuitem-link:hover .p-menuitem-text,
-body .p-menubar .p-menuitem-link:hover .p-menuitem-text,
-body .p-tieredmenu .p-menuitem-link:hover .p-menuitem-text,
-body .p-contextmenu .p-menuitem-link:hover .p-menuitem-text,
-body .p-megamenu .p-menuitem-link:hover .p-menuitem-text,
-body .p-slidemenu .p-menuitem-link:hover .p-menuitem-text {
+body .p-menu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-menubar .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-tieredmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-contextmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-megamenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-slidemenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
   color: #dedede;
 }
-body .p-menu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-menubar .p-menuitem-link:hover .p-menuitem-icon,
-body .p-tieredmenu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-contextmenu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-megamenu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-slidemenu .p-menuitem-link:hover .p-menuitem-icon {
+body .p-menu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-menubar .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-tieredmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-contextmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-megamenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-slidemenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon {
   color: #dedede;
 }
 body .p-menu .p-menuitem-link:focus,
diff --git a/public/themes/luna-green/theme.css b/public/themes/luna-green/theme.css
index c999f19aa..ce41727c7 100644
--- a/public/themes/luna-green/theme.css
+++ b/public/themes/luna-green/theme.css
@@ -1567,10 +1567,10 @@ body .p-panel .p-panel-titlebar .p-panel-titlebar-icon {
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
-  -moz-transition: color 0.2s, box-shadow 0.2s;
-  -o-transition: color 0.2s, box-shadow 0.2s;
-  -webkit-transition: color 0.2s, box-shadow 0.2s;
-  transition: color 0.2s, box-shadow 0.2s;
+  -moz-transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
+  -o-transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
+  -webkit-transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
+  transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
 }
 body .p-panel .p-panel-titlebar .p-panel-titlebar-icon:hover {
   color: #dedede;
@@ -3468,28 +3468,28 @@ body .p-slidemenu .p-menuitem-link .p-menuitem-icon {
   color: #dedede;
   margin-right: 0.5em;
 }
-body .p-menu .p-menuitem-link:hover,
-body .p-menubar .p-menuitem-link:hover,
-body .p-tieredmenu .p-menuitem-link:hover,
-body .p-contextmenu .p-menuitem-link:hover,
-body .p-megamenu .p-menuitem-link:hover,
-body .p-slidemenu .p-menuitem-link:hover {
+body .p-menu .p-menuitem-link:not(.p-disabled):hover,
+body .p-menubar .p-menuitem-link:not(.p-disabled):hover,
+body .p-tieredmenu .p-menuitem-link:not(.p-disabled):hover,
+body .p-contextmenu .p-menuitem-link:not(.p-disabled):hover,
+body .p-megamenu .p-menuitem-link:not(.p-disabled):hover,
+body .p-slidemenu .p-menuitem-link:not(.p-disabled):hover {
   background-color: #4c4c4c;
 }
-body .p-menu .p-menuitem-link:hover .p-menuitem-text,
-body .p-menubar .p-menuitem-link:hover .p-menuitem-text,
-body .p-tieredmenu .p-menuitem-link:hover .p-menuitem-text,
-body .p-contextmenu .p-menuitem-link:hover .p-menuitem-text,
-body .p-megamenu .p-menuitem-link:hover .p-menuitem-text,
-body .p-slidemenu .p-menuitem-link:hover .p-menuitem-text {
+body .p-menu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-menubar .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-tieredmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-contextmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-megamenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-slidemenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
   color: #dedede;
 }
-body .p-menu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-menubar .p-menuitem-link:hover .p-menuitem-icon,
-body .p-tieredmenu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-contextmenu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-megamenu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-slidemenu .p-menuitem-link:hover .p-menuitem-icon {
+body .p-menu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-menubar .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-tieredmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-contextmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-megamenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-slidemenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon {
   color: #dedede;
 }
 body .p-menu .p-menuitem-link:focus,
diff --git a/public/themes/luna-pink/theme.css b/public/themes/luna-pink/theme.css
index 23fc23938..5904b7888 100644
--- a/public/themes/luna-pink/theme.css
+++ b/public/themes/luna-pink/theme.css
@@ -1567,10 +1567,10 @@ body .p-panel .p-panel-titlebar .p-panel-titlebar-icon {
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
-  -moz-transition: color 0.2s, box-shadow 0.2s;
-  -o-transition: color 0.2s, box-shadow 0.2s;
-  -webkit-transition: color 0.2s, box-shadow 0.2s;
-  transition: color 0.2s, box-shadow 0.2s;
+  -moz-transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
+  -o-transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
+  -webkit-transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
+  transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
 }
 body .p-panel .p-panel-titlebar .p-panel-titlebar-icon:hover {
   color: #dedede;
@@ -3468,28 +3468,28 @@ body .p-slidemenu .p-menuitem-link .p-menuitem-icon {
   color: #dedede;
   margin-right: 0.5em;
 }
-body .p-menu .p-menuitem-link:hover,
-body .p-menubar .p-menuitem-link:hover,
-body .p-tieredmenu .p-menuitem-link:hover,
-body .p-contextmenu .p-menuitem-link:hover,
-body .p-megamenu .p-menuitem-link:hover,
-body .p-slidemenu .p-menuitem-link:hover {
+body .p-menu .p-menuitem-link:not(.p-disabled):hover,
+body .p-menubar .p-menuitem-link:not(.p-disabled):hover,
+body .p-tieredmenu .p-menuitem-link:not(.p-disabled):hover,
+body .p-contextmenu .p-menuitem-link:not(.p-disabled):hover,
+body .p-megamenu .p-menuitem-link:not(.p-disabled):hover,
+body .p-slidemenu .p-menuitem-link:not(.p-disabled):hover {
   background-color: #4c4c4c;
 }
-body .p-menu .p-menuitem-link:hover .p-menuitem-text,
-body .p-menubar .p-menuitem-link:hover .p-menuitem-text,
-body .p-tieredmenu .p-menuitem-link:hover .p-menuitem-text,
-body .p-contextmenu .p-menuitem-link:hover .p-menuitem-text,
-body .p-megamenu .p-menuitem-link:hover .p-menuitem-text,
-body .p-slidemenu .p-menuitem-link:hover .p-menuitem-text {
+body .p-menu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-menubar .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-tieredmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-contextmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-megamenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-slidemenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
   color: #dedede;
 }
-body .p-menu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-menubar .p-menuitem-link:hover .p-menuitem-icon,
-body .p-tieredmenu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-contextmenu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-megamenu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-slidemenu .p-menuitem-link:hover .p-menuitem-icon {
+body .p-menu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-menubar .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-tieredmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-contextmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-megamenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-slidemenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon {
   color: #dedede;
 }
 body .p-menu .p-menuitem-link:focus,
diff --git a/public/themes/nova-colored/theme.css b/public/themes/nova-colored/theme.css
index 97e7317e0..3b211e688 100644
--- a/public/themes/nova-colored/theme.css
+++ b/public/themes/nova-colored/theme.css
@@ -1567,10 +1567,10 @@ body .p-panel .p-panel-titlebar .p-panel-titlebar-icon {
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
-  -moz-transition: color 0.2s, box-shadow 0.2s;
-  -o-transition: color 0.2s, box-shadow 0.2s;
-  -webkit-transition: color 0.2s, box-shadow 0.2s;
-  transition: color 0.2s, box-shadow 0.2s;
+  -moz-transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
+  -o-transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
+  -webkit-transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
+  transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
 }
 body .p-panel .p-panel-titlebar .p-panel-titlebar-icon:hover {
   color: #5ab7ff;
@@ -3468,28 +3468,28 @@ body .p-slidemenu .p-menuitem-link .p-menuitem-icon {
   color: #333333;
   margin-right: 0.5em;
 }
-body .p-menu .p-menuitem-link:hover,
-body .p-menubar .p-menuitem-link:hover,
-body .p-tieredmenu .p-menuitem-link:hover,
-body .p-contextmenu .p-menuitem-link:hover,
-body .p-megamenu .p-menuitem-link:hover,
-body .p-slidemenu .p-menuitem-link:hover {
+body .p-menu .p-menuitem-link:not(.p-disabled):hover,
+body .p-menubar .p-menuitem-link:not(.p-disabled):hover,
+body .p-tieredmenu .p-menuitem-link:not(.p-disabled):hover,
+body .p-contextmenu .p-menuitem-link:not(.p-disabled):hover,
+body .p-megamenu .p-menuitem-link:not(.p-disabled):hover,
+body .p-slidemenu .p-menuitem-link:not(.p-disabled):hover {
   background-color: #eaeaea;
 }
-body .p-menu .p-menuitem-link:hover .p-menuitem-text,
-body .p-menubar .p-menuitem-link:hover .p-menuitem-text,
-body .p-tieredmenu .p-menuitem-link:hover .p-menuitem-text,
-body .p-contextmenu .p-menuitem-link:hover .p-menuitem-text,
-body .p-megamenu .p-menuitem-link:hover .p-menuitem-text,
-body .p-slidemenu .p-menuitem-link:hover .p-menuitem-text {
+body .p-menu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-menubar .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-tieredmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-contextmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-megamenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-slidemenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
   color: #333333;
 }
-body .p-menu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-menubar .p-menuitem-link:hover .p-menuitem-icon,
-body .p-tieredmenu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-contextmenu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-megamenu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-slidemenu .p-menuitem-link:hover .p-menuitem-icon {
+body .p-menu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-menubar .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-tieredmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-contextmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-megamenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-slidemenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon {
   color: #333333;
 }
 body .p-menu .p-menuitem-link:focus,
diff --git a/public/themes/nova-dark/theme.css b/public/themes/nova-dark/theme.css
index 321ebd8bf..56b8fdcad 100644
--- a/public/themes/nova-dark/theme.css
+++ b/public/themes/nova-dark/theme.css
@@ -1567,10 +1567,10 @@ body .p-panel .p-panel-titlebar .p-panel-titlebar-icon {
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
-  -moz-transition: color 0.2s, box-shadow 0.2s;
-  -o-transition: color 0.2s, box-shadow 0.2s;
-  -webkit-transition: color 0.2s, box-shadow 0.2s;
-  transition: color 0.2s, box-shadow 0.2s;
+  -moz-transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
+  -o-transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
+  -webkit-transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
+  transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
 }
 body .p-panel .p-panel-titlebar .p-panel-titlebar-icon:hover {
   color: #b4b4b4;
@@ -3468,28 +3468,28 @@ body .p-slidemenu .p-menuitem-link .p-menuitem-icon {
   color: #333333;
   margin-right: 0.5em;
 }
-body .p-menu .p-menuitem-link:hover,
-body .p-menubar .p-menuitem-link:hover,
-body .p-tieredmenu .p-menuitem-link:hover,
-body .p-contextmenu .p-menuitem-link:hover,
-body .p-megamenu .p-menuitem-link:hover,
-body .p-slidemenu .p-menuitem-link:hover {
+body .p-menu .p-menuitem-link:not(.p-disabled):hover,
+body .p-menubar .p-menuitem-link:not(.p-disabled):hover,
+body .p-tieredmenu .p-menuitem-link:not(.p-disabled):hover,
+body .p-contextmenu .p-menuitem-link:not(.p-disabled):hover,
+body .p-megamenu .p-menuitem-link:not(.p-disabled):hover,
+body .p-slidemenu .p-menuitem-link:not(.p-disabled):hover {
   background-color: #eaeaea;
 }
-body .p-menu .p-menuitem-link:hover .p-menuitem-text,
-body .p-menubar .p-menuitem-link:hover .p-menuitem-text,
-body .p-tieredmenu .p-menuitem-link:hover .p-menuitem-text,
-body .p-contextmenu .p-menuitem-link:hover .p-menuitem-text,
-body .p-megamenu .p-menuitem-link:hover .p-menuitem-text,
-body .p-slidemenu .p-menuitem-link:hover .p-menuitem-text {
+body .p-menu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-menubar .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-tieredmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-contextmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-megamenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-slidemenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
   color: #333333;
 }
-body .p-menu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-menubar .p-menuitem-link:hover .p-menuitem-icon,
-body .p-tieredmenu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-contextmenu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-megamenu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-slidemenu .p-menuitem-link:hover .p-menuitem-icon {
+body .p-menu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-menubar .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-tieredmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-contextmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-megamenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-slidemenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon {
   color: #333333;
 }
 body .p-menu .p-menuitem-link:focus,
diff --git a/public/themes/nova-light/theme.css b/public/themes/nova-light/theme.css
index 637b66d73..f25847cf2 100644
--- a/public/themes/nova-light/theme.css
+++ b/public/themes/nova-light/theme.css
@@ -1567,10 +1567,10 @@ body .p-panel .p-panel-titlebar .p-panel-titlebar-icon {
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
-  -moz-transition: color 0.2s, box-shadow 0.2s;
-  -o-transition: color 0.2s, box-shadow 0.2s;
-  -webkit-transition: color 0.2s, box-shadow 0.2s;
-  transition: color 0.2s, box-shadow 0.2s;
+  -moz-transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
+  -o-transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
+  -webkit-transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
+  transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
 }
 body .p-panel .p-panel-titlebar .p-panel-titlebar-icon:hover {
   color: #333333;
@@ -3468,28 +3468,28 @@ body .p-slidemenu .p-menuitem-link .p-menuitem-icon {
   color: #333333;
   margin-right: 0.5em;
 }
-body .p-menu .p-menuitem-link:hover,
-body .p-menubar .p-menuitem-link:hover,
-body .p-tieredmenu .p-menuitem-link:hover,
-body .p-contextmenu .p-menuitem-link:hover,
-body .p-megamenu .p-menuitem-link:hover,
-body .p-slidemenu .p-menuitem-link:hover {
+body .p-menu .p-menuitem-link:not(.p-disabled):hover,
+body .p-menubar .p-menuitem-link:not(.p-disabled):hover,
+body .p-tieredmenu .p-menuitem-link:not(.p-disabled):hover,
+body .p-contextmenu .p-menuitem-link:not(.p-disabled):hover,
+body .p-megamenu .p-menuitem-link:not(.p-disabled):hover,
+body .p-slidemenu .p-menuitem-link:not(.p-disabled):hover {
   background-color: #eaeaea;
 }
-body .p-menu .p-menuitem-link:hover .p-menuitem-text,
-body .p-menubar .p-menuitem-link:hover .p-menuitem-text,
-body .p-tieredmenu .p-menuitem-link:hover .p-menuitem-text,
-body .p-contextmenu .p-menuitem-link:hover .p-menuitem-text,
-body .p-megamenu .p-menuitem-link:hover .p-menuitem-text,
-body .p-slidemenu .p-menuitem-link:hover .p-menuitem-text {
+body .p-menu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-menubar .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-tieredmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-contextmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-megamenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-slidemenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
   color: #333333;
 }
-body .p-menu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-menubar .p-menuitem-link:hover .p-menuitem-icon,
-body .p-tieredmenu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-contextmenu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-megamenu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-slidemenu .p-menuitem-link:hover .p-menuitem-icon {
+body .p-menu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-menubar .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-tieredmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-contextmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-megamenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-slidemenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon {
   color: #333333;
 }
 body .p-menu .p-menuitem-link:focus,
diff --git a/public/themes/nova-vue/theme.css b/public/themes/nova-vue/theme.css
index 6625b31a1..a384121f8 100644
--- a/public/themes/nova-vue/theme.css
+++ b/public/themes/nova-vue/theme.css
@@ -1567,10 +1567,10 @@ body .p-panel .p-panel-titlebar .p-panel-titlebar-icon {
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
-  -moz-transition: color 0.2s, box-shadow 0.2s;
-  -o-transition: color 0.2s, box-shadow 0.2s;
-  -webkit-transition: color 0.2s, box-shadow 0.2s;
-  transition: color 0.2s, box-shadow 0.2s;
+  -moz-transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
+  -o-transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
+  -webkit-transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
+  transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
 }
 body .p-panel .p-panel-titlebar .p-panel-titlebar-icon:hover {
   color: #333333;
@@ -3468,28 +3468,28 @@ body .p-slidemenu .p-menuitem-link .p-menuitem-icon {
   color: #333333;
   margin-right: 0.5em;
 }
-body .p-menu .p-menuitem-link:hover,
-body .p-menubar .p-menuitem-link:hover,
-body .p-tieredmenu .p-menuitem-link:hover,
-body .p-contextmenu .p-menuitem-link:hover,
-body .p-megamenu .p-menuitem-link:hover,
-body .p-slidemenu .p-menuitem-link:hover {
+body .p-menu .p-menuitem-link:not(.p-disabled):hover,
+body .p-menubar .p-menuitem-link:not(.p-disabled):hover,
+body .p-tieredmenu .p-menuitem-link:not(.p-disabled):hover,
+body .p-contextmenu .p-menuitem-link:not(.p-disabled):hover,
+body .p-megamenu .p-menuitem-link:not(.p-disabled):hover,
+body .p-slidemenu .p-menuitem-link:not(.p-disabled):hover {
   background-color: #eaeaea;
 }
-body .p-menu .p-menuitem-link:hover .p-menuitem-text,
-body .p-menubar .p-menuitem-link:hover .p-menuitem-text,
-body .p-tieredmenu .p-menuitem-link:hover .p-menuitem-text,
-body .p-contextmenu .p-menuitem-link:hover .p-menuitem-text,
-body .p-megamenu .p-menuitem-link:hover .p-menuitem-text,
-body .p-slidemenu .p-menuitem-link:hover .p-menuitem-text {
+body .p-menu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-menubar .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-tieredmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-contextmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-megamenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-slidemenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
   color: #333333;
 }
-body .p-menu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-menubar .p-menuitem-link:hover .p-menuitem-icon,
-body .p-tieredmenu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-contextmenu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-megamenu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-slidemenu .p-menuitem-link:hover .p-menuitem-icon {
+body .p-menu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-menubar .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-tieredmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-contextmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-megamenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-slidemenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon {
   color: #333333;
 }
 body .p-menu .p-menuitem-link:focus,
diff --git a/public/themes/rhea/theme.css b/public/themes/rhea/theme.css
index e9458c91b..1bcfbeaec 100644
--- a/public/themes/rhea/theme.css
+++ b/public/themes/rhea/theme.css
@@ -1567,10 +1567,10 @@ body .p-panel .p-panel-titlebar .p-panel-titlebar-icon {
   -moz-border-radius: 2px;
   -webkit-border-radius: 2px;
   border-radius: 2px;
-  -moz-transition: color 0.2s, box-shadow 0.2s;
-  -o-transition: color 0.2s, box-shadow 0.2s;
-  -webkit-transition: color 0.2s, box-shadow 0.2s;
-  transition: color 0.2s, box-shadow 0.2s;
+  -moz-transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
+  -o-transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
+  -webkit-transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
+  transition: color 0.2s, background-color 0.2s, box-shadow 0.2s;
 }
 body .p-panel .p-panel-titlebar .p-panel-titlebar-icon:hover {
   color: #ffffff;
@@ -3468,28 +3468,28 @@ body .p-slidemenu .p-menuitem-link .p-menuitem-icon {
   color: #666666;
   margin-right: 0.5em;
 }
-body .p-menu .p-menuitem-link:hover,
-body .p-menubar .p-menuitem-link:hover,
-body .p-tieredmenu .p-menuitem-link:hover,
-body .p-contextmenu .p-menuitem-link:hover,
-body .p-megamenu .p-menuitem-link:hover,
-body .p-slidemenu .p-menuitem-link:hover {
+body .p-menu .p-menuitem-link:not(.p-disabled):hover,
+body .p-menubar .p-menuitem-link:not(.p-disabled):hover,
+body .p-tieredmenu .p-menuitem-link:not(.p-disabled):hover,
+body .p-contextmenu .p-menuitem-link:not(.p-disabled):hover,
+body .p-megamenu .p-menuitem-link:not(.p-disabled):hover,
+body .p-slidemenu .p-menuitem-link:not(.p-disabled):hover {
   background-color: #eaeaea;
 }
-body .p-menu .p-menuitem-link:hover .p-menuitem-text,
-body .p-menubar .p-menuitem-link:hover .p-menuitem-text,
-body .p-tieredmenu .p-menuitem-link:hover .p-menuitem-text,
-body .p-contextmenu .p-menuitem-link:hover .p-menuitem-text,
-body .p-megamenu .p-menuitem-link:hover .p-menuitem-text,
-body .p-slidemenu .p-menuitem-link:hover .p-menuitem-text {
+body .p-menu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-menubar .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-tieredmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-contextmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-megamenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text,
+body .p-slidemenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
   color: #666666;
 }
-body .p-menu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-menubar .p-menuitem-link:hover .p-menuitem-icon,
-body .p-tieredmenu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-contextmenu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-megamenu .p-menuitem-link:hover .p-menuitem-icon,
-body .p-slidemenu .p-menuitem-link:hover .p-menuitem-icon {
+body .p-menu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-menubar .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-tieredmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-contextmenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-megamenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon,
+body .p-slidemenu .p-menuitem-link:not(.p-disabled):hover .p-menuitem-icon {
   color: #666666;
 }
 body .p-menu .p-menuitem-link:focus,
diff --git a/src/components/menu/Menu.vue b/src/components/menu/Menu.vue
index 9f92ccfed..97bb3a08b 100644
--- a/src/components/menu/Menu.vue
+++ b/src/components/menu/Menu.vue
@@ -60,8 +60,8 @@ export default {
     methods: {
         itemClick(event) {
             const item = event.item;
-            if (item.disabled || (!item.to && !item.url)) {
-                event.originalEvent.preventDefault();
+            if (item.disabled) {
+                return;
             }
 
             if (item.command) {
@@ -198,6 +198,7 @@ export default {
     padding: .25em;
     display: block;
     text-decoration: none;
+    cursor: pointer;
 }
 
 .p-menu .p-menuitem-icon {
diff --git a/src/components/menu/Menuitem.vue b/src/components/menu/Menuitem.vue
index a940d192e..db6a6aa12 100644
--- a/src/components/menu/Menuitem.vue
+++ b/src/components/menu/Menuitem.vue
@@ -1,10 +1,10 @@
 <template>
     <li :class="containerClass" role="none" :style="item.style" v-if="item.visible !== false">
-        <router-link v-if="item.to" :to="item.to" class="p-menuitem-link" role="menuitem">
+        <router-link v-if="item.to" :to="item.to" :class="linkClass" role="menuitem">
             <span :class="['p-menuitem-icon', item.icon]"></span>
             <span class="p-menuitem-text">{{item.label}}</span>
         </router-link>
-        <a v-else :href="item.url||'#'" class="p-menuitem-link" @click="onClick" :target="item.target" role="menuitem" >
+        <a v-else :href="item.url" :class="linkClass" @click="onClick" :target="item.target" role="menuitem" :tabindex="item.disabled ? null : '0'">
             <span :class="['p-menuitem-icon', item.icon]"></span>
             <span class="p-menuitem-text">{{item.label}}</span>
         </a>
@@ -26,10 +26,10 @@ export default {
     },
     computed: {
         containerClass() {
-            return [
-                'p-menitem',
-                this.item.class
-            ]
+            return ['p-menuitem', this.item.class];
+        },
+        linkClass() {
+            return ['p-menuitem-link', {'p-disabled': this.item.disabled}];
         }
     }
 }
diff --git a/src/components/splitbutton/SplitButton.vue b/src/components/splitbutton/SplitButton.vue
index 9e107fcb8..90dc8a9b5 100644
--- a/src/components/splitbutton/SplitButton.vue
+++ b/src/components/splitbutton/SplitButton.vue
@@ -6,8 +6,13 @@
         <transition name="p-input-overlay" @enter="onOverlayEnter" @leave="onOverlayLeave">
             <div id="ariaId + '_overlay'" ref="overlay" class="p-menu p-menu-dynamic p-component" v-if="overlayVisible">
                 <ul class="p-menu-list p-reset" role="menu">
-                    <li role="none" v-for="item of model" :key="item.label" :target="item.target" :style="item.style" :class="['p-menuitem', item.class]">
-                        <a :href="item.url||'#'" class="p-menuitem-link" @click="itemClick($event, item)" role="menuitem">
+                    <li v-for="item of model" :key="item.label" :target="item.target" :style="item.style" :class="['p-menuitem', item.class]" role="menuitem">
+                        <router-link v-if="item.to" :to="item.to" :class="['p-menuitem-link', {'p-disabled': item.disabled}]">
+                            <span :class="['p-menuitem-icon', item.icon]"></span>
+                            <span class="p-menuitem-text">{{item.label}}</span>
+                        </router-link>
+                        <a v-else :href="item.url" :class="['p-menuitem-link', {'p-disabled': item.disabled}]"
+                            @click="itemClick($event, item)" :target="item.target" :tabindex="item.disabled ? null : '0'">
                             <span :class="['p-menuitem-icon', item.icon]"></span>
                             <span class="p-menuitem-text">{{item.label}}</span>
                         </a>
@@ -71,11 +76,16 @@ export default {
             this.overlayVisible = !this.overlayVisible;
         },
         itemClick(event, item) {
+            if (item.disabled) {
+                return;
+            }
+
             if (item.command) {
                 item.command({originalEvent: event, item: item });
+                event.preventDefault();
             }
+
             this.overlayVisible = false;
-            event.preventDefault();
         },
         onOverlayEnter() {
             if (this.autoZIndex) {