diff --git a/public/themes/arya-blue/theme.css b/public/themes/arya-blue/theme.css
index f40b3600d..0de095523 100644
--- a/public/themes/arya-blue/theme.css
+++ b/public/themes/arya-blue/theme.css
@@ -158,20 +158,26 @@
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
   border: 0 none;
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #BBDEFB;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -238,17 +244,24 @@
   padding: 0.5rem;
 }
 .p-datepicker .p-timepicker button {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
   background: transparent;
   border-radius: 50%;
-  transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #BBDEFB;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -287,10 +300,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: rgba(255, 255, 255, 0.87);
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: rgba(255, 255, 255, 0.03);
 }
@@ -904,13 +913,17 @@
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #BBDEFB;
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0.5rem 0;
 }
@@ -1612,20 +1625,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: transparent;
-  border: 0 none;
-  color: rgba(255, 255, 255, 0.6);
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin: 0.5rem;
+  margin: 0 0.5rem;
 }
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: rgba(255, 255, 255, 0.03);
-  border-color: transparent;
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #BBDEFB;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1734,23 +1753,41 @@
   border-width: 0 0 1px 0;
   padding: 1rem 1rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #BBDEFB;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: #64B5F6;
   color: #212529;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #212529;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #212529;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 #64B5F6;
 }
@@ -2064,20 +2101,15 @@
   padding: 1rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: rgba(255, 255, 255, 0.6);
-  border-radius: 3px;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 1px #BBDEFB;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: rgba(255, 255, 255, 0.87);
-}
 
 .p-paginator {
   background: #1e1e1e;
@@ -2244,11 +2276,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #BBDEFB;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2381,12 +2425,24 @@
   padding: 1rem 1rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
-  margin-right: 0.5rem;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #BBDEFB;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2581,7 +2637,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 1rem;
@@ -2618,12 +2674,12 @@
   width: 2rem;
   height: 2rem;
   color: rgba(255, 255, 255, 0.6);
-  background: transparent;
   border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
@@ -2740,7 +2796,7 @@
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
@@ -2788,19 +2844,17 @@
 }
 .p-overlaypanel .p-overlaypanel-close {
   background: #64B5F6;
-  border: 0 none;
   color: #212529;
   width: 2rem;
   height: 2rem;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
   position: absolute;
   top: -1rem;
   right: -1rem;
-  border-radius: 50%;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
-  background: #2196F3;
-  border-color: transparent;
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
+  background: #42A5F5;
   color: #212529;
 }
 .p-overlaypanel:after {
@@ -2828,18 +2882,23 @@
   box-shadow: 0px 11px 15px -7px rgba(0, 0, 0, 0.2), 0px 24px 38px 3px rgba(0, 0, 0, 0.14), 0px 9px 46px 8px rgba(0, 0, 0, 0.12);
 }
 .p-sidebar .p-sidebar-close {
-  background: transparent;
-  border: 0 none;
-  color: rgba(255, 255, 255, 0.6);
   width: 2rem;
   height: 2rem;
+  color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: rgba(255, 255, 255, 0.03);
-  border-color: transparent;
+.p-sidebar .p-sidebar-close:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #BBDEFB;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3318,21 +3377,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
+    width: 2rem;
+    height: 2rem;
     color: rgba(255, 255, 255, 0.6);
-    background: transparent;
-    border: 0 none;
-    width: 2.5rem;
-    height: 2.5rem;
     border-radius: 50%;
     transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1.5rem;
-  }
   .p-menubar .p-menubar-button:hover {
     color: rgba(255, 255, 255, 0.87);
     background: rgba(255, 255, 255, 0.03);
-    border-color: transparent;
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3767,6 +3820,21 @@
 .p-message .p-message-wrapper {
   padding: 1rem 1.5rem;
 }
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #BBDEFB;
+}
 .p-message.p-message-info {
   background: #B3E5FC;
   border: solid #03A9F4;
@@ -3777,7 +3845,6 @@
   color: #01579B;
 }
 .p-message.p-message-info .p-message-close {
-  background: #B3E5FC;
   color: #01579B;
 }
 .p-message.p-message-success {
@@ -3790,7 +3857,6 @@
   color: #1B5E20;
 }
 .p-message.p-message-success .p-message-close {
-  background: #C8E6C9;
   color: #1B5E20;
 }
 .p-message.p-message-warn {
@@ -3803,7 +3869,6 @@
   color: #7f6003;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #FFECB3;
   color: #7f6003;
 }
 .p-message.p-message-error {
@@ -3816,23 +3881,8 @@
   color: #B71C1C;
 }
 .p-message.p-message-error .p-message-close {
-  background: #FFCDD2;
   color: #B71C1C;
 }
-.p-message .p-message-close {
-  border-radius: 50%;
-  width: 2rem;
-  height: 2rem;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-}
-.p-message .p-message-close:hover {
-  background: rgba(255, 255, 255, 0.5);
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: 0 0 0 1px #BBDEFB;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: 500;
@@ -3867,13 +3917,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  border-radius: 50%;
+  background: transparent;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: rgba(255, 255, 255, 0.2);
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #BBDEFB;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #B3E5FC;
diff --git a/public/themes/arya-green/theme.css b/public/themes/arya-green/theme.css
index 73be430fd..851fbf140 100644
--- a/public/themes/arya-green/theme.css
+++ b/public/themes/arya-green/theme.css
@@ -158,20 +158,26 @@
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
   border: 0 none;
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #C8E6C9;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -238,17 +244,24 @@
   padding: 0.5rem;
 }
 .p-datepicker .p-timepicker button {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
   background: transparent;
   border-radius: 50%;
-  transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #C8E6C9;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -287,10 +300,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: rgba(255, 255, 255, 0.87);
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: rgba(255, 255, 255, 0.03);
 }
@@ -904,13 +913,17 @@
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #C8E6C9;
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0.5rem 0;
 }
@@ -1612,20 +1625,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: transparent;
-  border: 0 none;
-  color: rgba(255, 255, 255, 0.6);
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin: 0.5rem;
+  margin: 0 0.5rem;
 }
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: rgba(255, 255, 255, 0.03);
-  border-color: transparent;
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #C8E6C9;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1734,23 +1753,41 @@
   border-width: 0 0 1px 0;
   padding: 1rem 1rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #C8E6C9;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: #81C784;
   color: #212529;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #212529;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #212529;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 #81C784;
 }
@@ -2064,20 +2101,15 @@
   padding: 1rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: rgba(255, 255, 255, 0.6);
-  border-radius: 3px;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 1px #C8E6C9;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: rgba(255, 255, 255, 0.87);
-}
 
 .p-paginator {
   background: #1e1e1e;
@@ -2244,11 +2276,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #C8E6C9;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2381,12 +2425,24 @@
   padding: 1rem 1rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
-  margin-right: 0.5rem;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #C8E6C9;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2581,7 +2637,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 1rem;
@@ -2618,12 +2674,12 @@
   width: 2rem;
   height: 2rem;
   color: rgba(255, 255, 255, 0.6);
-  background: transparent;
   border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
@@ -2740,7 +2796,7 @@
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
@@ -2788,19 +2844,17 @@
 }
 .p-overlaypanel .p-overlaypanel-close {
   background: #81C784;
-  border: 0 none;
   color: #212529;
   width: 2rem;
   height: 2rem;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
   position: absolute;
   top: -1rem;
   right: -1rem;
-  border-radius: 50%;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
-  background: #4CAF50;
-  border-color: transparent;
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
+  background: #66BB6A;
   color: #212529;
 }
 .p-overlaypanel:after {
@@ -2828,18 +2882,23 @@
   box-shadow: 0px 11px 15px -7px rgba(0, 0, 0, 0.2), 0px 24px 38px 3px rgba(0, 0, 0, 0.14), 0px 9px 46px 8px rgba(0, 0, 0, 0.12);
 }
 .p-sidebar .p-sidebar-close {
-  background: transparent;
-  border: 0 none;
-  color: rgba(255, 255, 255, 0.6);
   width: 2rem;
   height: 2rem;
+  color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: rgba(255, 255, 255, 0.03);
-  border-color: transparent;
+.p-sidebar .p-sidebar-close:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #C8E6C9;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3318,21 +3377,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
+    width: 2rem;
+    height: 2rem;
     color: rgba(255, 255, 255, 0.6);
-    background: transparent;
-    border: 0 none;
-    width: 2.5rem;
-    height: 2.5rem;
     border-radius: 50%;
     transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1.5rem;
-  }
   .p-menubar .p-menubar-button:hover {
     color: rgba(255, 255, 255, 0.87);
     background: rgba(255, 255, 255, 0.03);
-    border-color: transparent;
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3767,6 +3820,21 @@
 .p-message .p-message-wrapper {
   padding: 1rem 1.5rem;
 }
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #C8E6C9;
+}
 .p-message.p-message-info {
   background: #B3E5FC;
   border: solid #03A9F4;
@@ -3777,7 +3845,6 @@
   color: #01579B;
 }
 .p-message.p-message-info .p-message-close {
-  background: #B3E5FC;
   color: #01579B;
 }
 .p-message.p-message-success {
@@ -3790,7 +3857,6 @@
   color: #1B5E20;
 }
 .p-message.p-message-success .p-message-close {
-  background: #C8E6C9;
   color: #1B5E20;
 }
 .p-message.p-message-warn {
@@ -3803,7 +3869,6 @@
   color: #7f6003;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #FFECB3;
   color: #7f6003;
 }
 .p-message.p-message-error {
@@ -3816,23 +3881,8 @@
   color: #B71C1C;
 }
 .p-message.p-message-error .p-message-close {
-  background: #FFCDD2;
   color: #B71C1C;
 }
-.p-message .p-message-close {
-  border-radius: 50%;
-  width: 2rem;
-  height: 2rem;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-}
-.p-message .p-message-close:hover {
-  background: rgba(255, 255, 255, 0.5);
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: 0 0 0 1px #C8E6C9;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: 500;
@@ -3867,13 +3917,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  border-radius: 50%;
+  background: transparent;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: rgba(255, 255, 255, 0.2);
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #C8E6C9;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #B3E5FC;
diff --git a/public/themes/arya-orange/theme.css b/public/themes/arya-orange/theme.css
index aad66f4ce..c2715b5a6 100644
--- a/public/themes/arya-orange/theme.css
+++ b/public/themes/arya-orange/theme.css
@@ -158,20 +158,26 @@
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
   border: 0 none;
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #FFECB3;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -238,17 +244,24 @@
   padding: 0.5rem;
 }
 .p-datepicker .p-timepicker button {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
   background: transparent;
   border-radius: 50%;
-  transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #FFECB3;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -287,10 +300,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: rgba(255, 255, 255, 0.87);
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: rgba(255, 255, 255, 0.03);
 }
@@ -904,13 +913,17 @@
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #FFECB3;
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0.5rem 0;
 }
@@ -1612,20 +1625,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: transparent;
-  border: 0 none;
-  color: rgba(255, 255, 255, 0.6);
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin: 0.5rem;
+  margin: 0 0.5rem;
 }
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: rgba(255, 255, 255, 0.03);
-  border-color: transparent;
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #FFECB3;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1734,23 +1753,41 @@
   border-width: 0 0 1px 0;
   padding: 1rem 1rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #FFECB3;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: #FFD54F;
   color: #212529;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #212529;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #212529;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 #FFD54F;
 }
@@ -2064,20 +2101,15 @@
   padding: 1rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: rgba(255, 255, 255, 0.6);
-  border-radius: 3px;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 1px #FFECB3;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: rgba(255, 255, 255, 0.87);
-}
 
 .p-paginator {
   background: #1e1e1e;
@@ -2244,11 +2276,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #FFECB3;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2381,12 +2425,24 @@
   padding: 1rem 1rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
-  margin-right: 0.5rem;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #FFECB3;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2581,7 +2637,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 1rem;
@@ -2618,12 +2674,12 @@
   width: 2rem;
   height: 2rem;
   color: rgba(255, 255, 255, 0.6);
-  background: transparent;
   border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
@@ -2740,7 +2796,7 @@
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
@@ -2788,19 +2844,17 @@
 }
 .p-overlaypanel .p-overlaypanel-close {
   background: #FFD54F;
-  border: 0 none;
   color: #212529;
   width: 2rem;
   height: 2rem;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
   position: absolute;
   top: -1rem;
   right: -1rem;
-  border-radius: 50%;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
-  background: #FFC107;
-  border-color: transparent;
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
+  background: #FFCA28;
   color: #212529;
 }
 .p-overlaypanel:after {
@@ -2828,18 +2882,23 @@
   box-shadow: 0px 11px 15px -7px rgba(0, 0, 0, 0.2), 0px 24px 38px 3px rgba(0, 0, 0, 0.14), 0px 9px 46px 8px rgba(0, 0, 0, 0.12);
 }
 .p-sidebar .p-sidebar-close {
-  background: transparent;
-  border: 0 none;
-  color: rgba(255, 255, 255, 0.6);
   width: 2rem;
   height: 2rem;
+  color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: rgba(255, 255, 255, 0.03);
-  border-color: transparent;
+.p-sidebar .p-sidebar-close:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #FFECB3;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3318,21 +3377,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
+    width: 2rem;
+    height: 2rem;
     color: rgba(255, 255, 255, 0.6);
-    background: transparent;
-    border: 0 none;
-    width: 2.5rem;
-    height: 2.5rem;
     border-radius: 50%;
     transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1.5rem;
-  }
   .p-menubar .p-menubar-button:hover {
     color: rgba(255, 255, 255, 0.87);
     background: rgba(255, 255, 255, 0.03);
-    border-color: transparent;
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3767,6 +3820,21 @@
 .p-message .p-message-wrapper {
   padding: 1rem 1.5rem;
 }
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #FFECB3;
+}
 .p-message.p-message-info {
   background: #B3E5FC;
   border: solid #03A9F4;
@@ -3777,7 +3845,6 @@
   color: #01579B;
 }
 .p-message.p-message-info .p-message-close {
-  background: #B3E5FC;
   color: #01579B;
 }
 .p-message.p-message-success {
@@ -3790,7 +3857,6 @@
   color: #1B5E20;
 }
 .p-message.p-message-success .p-message-close {
-  background: #C8E6C9;
   color: #1B5E20;
 }
 .p-message.p-message-warn {
@@ -3803,7 +3869,6 @@
   color: #7f6003;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #FFECB3;
   color: #7f6003;
 }
 .p-message.p-message-error {
@@ -3816,23 +3881,8 @@
   color: #B71C1C;
 }
 .p-message.p-message-error .p-message-close {
-  background: #FFCDD2;
   color: #B71C1C;
 }
-.p-message .p-message-close {
-  border-radius: 50%;
-  width: 2rem;
-  height: 2rem;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-}
-.p-message .p-message-close:hover {
-  background: rgba(255, 255, 255, 0.5);
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: 0 0 0 1px #FFECB3;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: 500;
@@ -3867,13 +3917,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  border-radius: 50%;
+  background: transparent;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: rgba(255, 255, 255, 0.2);
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #FFECB3;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #B3E5FC;
diff --git a/public/themes/arya-purple/theme.css b/public/themes/arya-purple/theme.css
index 8e3842825..b96648877 100644
--- a/public/themes/arya-purple/theme.css
+++ b/public/themes/arya-purple/theme.css
@@ -158,20 +158,26 @@
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
   border: 0 none;
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #E1BEE7;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -238,17 +244,24 @@
   padding: 0.5rem;
 }
 .p-datepicker .p-timepicker button {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
   background: transparent;
   border-radius: 50%;
-  transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #E1BEE7;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -287,10 +300,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: rgba(255, 255, 255, 0.87);
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: rgba(255, 255, 255, 0.03);
 }
@@ -904,13 +913,17 @@
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #E1BEE7;
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0.5rem 0;
 }
@@ -1612,20 +1625,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: transparent;
-  border: 0 none;
-  color: rgba(255, 255, 255, 0.6);
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin: 0.5rem;
+  margin: 0 0.5rem;
 }
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: rgba(255, 255, 255, 0.03);
-  border-color: transparent;
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #E1BEE7;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1734,23 +1753,41 @@
   border-width: 0 0 1px 0;
   padding: 1rem 1rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #E1BEE7;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: #BA68C8;
   color: #ffffff;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #ffffff;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #ffffff;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 #BA68C8;
 }
@@ -2064,20 +2101,15 @@
   padding: 1rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: rgba(255, 255, 255, 0.6);
-  border-radius: 3px;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 1px #E1BEE7;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: rgba(255, 255, 255, 0.87);
-}
 
 .p-paginator {
   background: #1e1e1e;
@@ -2244,11 +2276,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #E1BEE7;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2381,12 +2425,24 @@
   padding: 1rem 1rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
-  margin-right: 0.5rem;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #E1BEE7;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2581,7 +2637,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 1rem;
@@ -2618,12 +2674,12 @@
   width: 2rem;
   height: 2rem;
   color: rgba(255, 255, 255, 0.6);
-  background: transparent;
   border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
@@ -2740,7 +2796,7 @@
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
@@ -2788,19 +2844,17 @@
 }
 .p-overlaypanel .p-overlaypanel-close {
   background: #BA68C8;
-  border: 0 none;
   color: #ffffff;
   width: 2rem;
   height: 2rem;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
   position: absolute;
   top: -1rem;
   right: -1rem;
-  border-radius: 50%;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
-  background: #9C27B0;
-  border-color: transparent;
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
+  background: #AB47BC;
   color: #ffffff;
 }
 .p-overlaypanel:after {
@@ -2828,18 +2882,23 @@
   box-shadow: 0px 11px 15px -7px rgba(0, 0, 0, 0.2), 0px 24px 38px 3px rgba(0, 0, 0, 0.14), 0px 9px 46px 8px rgba(0, 0, 0, 0.12);
 }
 .p-sidebar .p-sidebar-close {
-  background: transparent;
-  border: 0 none;
-  color: rgba(255, 255, 255, 0.6);
   width: 2rem;
   height: 2rem;
+  color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: rgba(255, 255, 255, 0.03);
-  border-color: transparent;
+.p-sidebar .p-sidebar-close:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #E1BEE7;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3318,21 +3377,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
+    width: 2rem;
+    height: 2rem;
     color: rgba(255, 255, 255, 0.6);
-    background: transparent;
-    border: 0 none;
-    width: 2.5rem;
-    height: 2.5rem;
     border-radius: 50%;
     transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1.5rem;
-  }
   .p-menubar .p-menubar-button:hover {
     color: rgba(255, 255, 255, 0.87);
     background: rgba(255, 255, 255, 0.03);
-    border-color: transparent;
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3767,6 +3820,21 @@
 .p-message .p-message-wrapper {
   padding: 1rem 1.5rem;
 }
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #E1BEE7;
+}
 .p-message.p-message-info {
   background: #B3E5FC;
   border: solid #03A9F4;
@@ -3777,7 +3845,6 @@
   color: #01579B;
 }
 .p-message.p-message-info .p-message-close {
-  background: #B3E5FC;
   color: #01579B;
 }
 .p-message.p-message-success {
@@ -3790,7 +3857,6 @@
   color: #1B5E20;
 }
 .p-message.p-message-success .p-message-close {
-  background: #C8E6C9;
   color: #1B5E20;
 }
 .p-message.p-message-warn {
@@ -3803,7 +3869,6 @@
   color: #7f6003;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #FFECB3;
   color: #7f6003;
 }
 .p-message.p-message-error {
@@ -3816,23 +3881,8 @@
   color: #B71C1C;
 }
 .p-message.p-message-error .p-message-close {
-  background: #FFCDD2;
   color: #B71C1C;
 }
-.p-message .p-message-close {
-  border-radius: 50%;
-  width: 2rem;
-  height: 2rem;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-}
-.p-message .p-message-close:hover {
-  background: rgba(255, 255, 255, 0.5);
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: 0 0 0 1px #E1BEE7;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: 500;
@@ -3867,13 +3917,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  border-radius: 50%;
+  background: transparent;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: rgba(255, 255, 255, 0.2);
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #E1BEE7;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #B3E5FC;
diff --git a/public/themes/bootstrap4-dark-blue/theme.css b/public/themes/bootstrap4-dark-blue/theme.css
index 8c5daadf9..aa0723c0c 100644
--- a/public/themes/bootstrap4-dark-blue/theme.css
+++ b/public/themes/bootstrap4-dark-blue/theme.css
@@ -158,20 +158,26 @@
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
   border: 0 none;
   background: transparent;
-  border-radius: 4px;
+  border-radius: 50%;
   transition: color 0.15s, box-shadow 0.15s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: transparent;
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #e3f3fe;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -238,17 +244,24 @@
   padding: 0.5rem;
 }
 .p-datepicker .p-timepicker button {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
   background: transparent;
-  border-radius: 4px;
-  transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+  border-radius: 50%;
+  transition: color 0.15s, box-shadow 0.15s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
   background: transparent;
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #e3f3fe;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -287,10 +300,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: rgba(255, 255, 255, 0.87);
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: rgba(255, 255, 255, 0.04);
 }
@@ -902,15 +911,19 @@
   color: rgba(255, 255, 255, 0.6);
   border: 0 none;
   background: transparent;
-  border-radius: 4px;
+  border-radius: 50%;
   transition: color 0.15s, box-shadow 0.15s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: transparent;
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #e3f3fe;
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0.5rem 0;
 }
@@ -1612,20 +1625,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: transparent;
-  border: 0 none;
-  color: rgba(255, 255, 255, 0.6);
-  border-radius: 4px;
   width: 2rem;
   height: 2rem;
-  transition: color 0.15s, box-shadow 0.15s;
-  margin: 0.5rem;
-}
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
+  color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
   background: transparent;
-  border-color: transparent;
+  border-radius: 50%;
+  transition: color 0.15s, box-shadow 0.15s;
+  margin: 0 0.5rem;
+}
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: transparent;
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #e3f3fe;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1734,23 +1753,41 @@
   border-width: 1px 0 0 0;
   padding: 1rem 1rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: color 0.15s, box-shadow 0.15s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: transparent;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #e3f3fe;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: #8dd0ff;
   color: #151515;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #151515;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #151515;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 #8dd0ff;
 }
@@ -2064,20 +2101,15 @@
   padding: 1.25rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: rgba(255, 255, 255, 0.6);
-  border-radius: 4px;
-  transition: color 0.15s, box-shadow 0.15s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 1px #e3f3fe;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: rgba(255, 255, 255, 0.87);
-}
 
 .p-paginator {
   background: #2a323d;
@@ -2244,11 +2276,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: color 0.15s, box-shadow 0.15s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: transparent;
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #e3f3fe;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2381,12 +2425,24 @@
   padding: 1rem 1rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
-  margin-right: 0.5rem;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: color 0.15s, box-shadow 0.15s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: transparent;
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #e3f3fe;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2581,7 +2637,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: box-shadow 0.15s;
+  transition: color 0.15s, box-shadow 0.15s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 1rem 1.25rem;
@@ -2618,12 +2674,12 @@
   width: 2rem;
   height: 2rem;
   color: rgba(255, 255, 255, 0.6);
-  background: transparent;
   border: 0 none;
-  border-radius: 4px;
+  background: transparent;
+  border-radius: 50%;
   transition: color 0.15s, box-shadow 0.15s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: transparent;
@@ -2736,11 +2792,11 @@
   color: rgba(255, 255, 255, 0.6);
   border: 0 none;
   background: transparent;
-  border-radius: 4px;
+  border-radius: 50%;
   transition: color 0.15s, box-shadow 0.15s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: transparent;
@@ -2787,21 +2843,19 @@
   padding: 1rem;
 }
 .p-overlaypanel .p-overlaypanel-close {
-  background: #2a323d;
-  border: 1px solid #3f4b5b;
-  color: rgba(255, 255, 255, 0.6);
+  background: #8dd0ff;
+  color: #151515;
   width: 2rem;
   height: 2rem;
+  transition: color 0.15s, box-shadow 0.15s;
+  border-radius: 50%;
   position: absolute;
   top: -1rem;
   right: -1rem;
-  border-radius: 50%;
-  transition: color 0.15s, box-shadow 0.15s;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
-  background: #2a323d;
-  border-color: 1px solid #3f4b5b;
-  color: rgba(255, 255, 255, 0.87);
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
+  background: #56bdff;
+  color: #151515;
 }
 .p-overlaypanel:after {
   border: solid transparent;
@@ -2828,18 +2882,23 @@
   box-shadow: none;
 }
 .p-sidebar .p-sidebar-close {
-  background: transparent;
-  border: 0 none;
-  color: rgba(255, 255, 255, 0.6);
   width: 2rem;
   height: 2rem;
-  border-radius: 4px;
+  color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: color 0.15s, box-shadow 0.15s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: transparent;
-  border-color: transparent;
+.p-sidebar .p-sidebar-close:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: transparent;
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #e3f3fe;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3318,21 +3377,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
+    width: 2rem;
+    height: 2rem;
     color: rgba(255, 255, 255, 0.6);
-    background: transparent;
-    border: 1px solid #3f4b5b;
-    width: 2.5rem;
-    height: 2.5rem;
-    border-radius: 4px;
+    border-radius: 50%;
     transition: color 0.15s, box-shadow 0.15s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1.25rem;
-  }
   .p-menubar .p-menubar-button:hover {
     color: rgba(255, 255, 255, 0.87);
     background: transparent;
-    border-color: rgba(255, 255, 255, 0.6);
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3767,6 +3820,21 @@
 .p-message .p-message-wrapper {
   padding: 1rem 1.25rem;
 }
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: color 0.15s, box-shadow 0.15s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #e3f3fe;
+}
 .p-message.p-message-info {
   background: #cce5ff;
   border: solid #b8daff;
@@ -3777,7 +3845,6 @@
   color: #004085;
 }
 .p-message.p-message-info .p-message-close {
-  background: #cce5ff;
   color: #004085;
 }
 .p-message.p-message-success {
@@ -3790,7 +3857,6 @@
   color: #155724;
 }
 .p-message.p-message-success .p-message-close {
-  background: #d4edda;
   color: #155724;
 }
 .p-message.p-message-warn {
@@ -3803,7 +3869,6 @@
   color: #856404;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #fff3cd;
   color: #856404;
 }
 .p-message.p-message-error {
@@ -3816,23 +3881,8 @@
   color: #721c24;
 }
 .p-message.p-message-error .p-message-close {
-  background: #f8d7da;
   color: #721c24;
 }
-.p-message .p-message-close {
-  border-radius: 4px;
-  width: 2rem;
-  height: 2rem;
-  transition: color 0.15s, box-shadow 0.15s;
-}
-.p-message .p-message-close:hover {
-  background: rgba(255, 255, 255, 0.2);
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: 0 0 0 1px #e3f3fe;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: 500;
@@ -3867,13 +3917,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
-  border-radius: 4px;
   width: 2rem;
   height: 2rem;
+  border-radius: 50%;
+  background: transparent;
   transition: color 0.15s, box-shadow 0.15s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: rgba(255, 255, 255, 0.2);
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #e3f3fe;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #cce5ff;
diff --git a/public/themes/bootstrap4-dark-purple/theme.css b/public/themes/bootstrap4-dark-purple/theme.css
index d0eb4768f..0bf151d0a 100644
--- a/public/themes/bootstrap4-dark-purple/theme.css
+++ b/public/themes/bootstrap4-dark-purple/theme.css
@@ -158,20 +158,26 @@
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
   border: 0 none;
   background: transparent;
-  border-radius: 4px;
+  border-radius: 50%;
   transition: color 0.15s, box-shadow 0.15s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: transparent;
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #f0e6f5;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -238,17 +244,24 @@
   padding: 0.5rem;
 }
 .p-datepicker .p-timepicker button {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
   background: transparent;
-  border-radius: 4px;
-  transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+  border-radius: 50%;
+  transition: color 0.15s, box-shadow 0.15s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
   background: transparent;
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #f0e6f5;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -287,10 +300,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: rgba(255, 255, 255, 0.87);
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: rgba(255, 255, 255, 0.04);
 }
@@ -902,15 +911,19 @@
   color: rgba(255, 255, 255, 0.6);
   border: 0 none;
   background: transparent;
-  border-radius: 4px;
+  border-radius: 50%;
   transition: color 0.15s, box-shadow 0.15s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: transparent;
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #f0e6f5;
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0.5rem 0;
 }
@@ -1612,20 +1625,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: transparent;
-  border: 0 none;
-  color: rgba(255, 255, 255, 0.6);
-  border-radius: 4px;
   width: 2rem;
   height: 2rem;
-  transition: color 0.15s, box-shadow 0.15s;
-  margin: 0.5rem;
-}
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
+  color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
   background: transparent;
-  border-color: transparent;
+  border-radius: 50%;
+  transition: color 0.15s, box-shadow 0.15s;
+  margin: 0 0.5rem;
+}
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: transparent;
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #f0e6f5;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1734,23 +1753,41 @@
   border-width: 1px 0 0 0;
   padding: 1rem 1rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: color 0.15s, box-shadow 0.15s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: transparent;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #f0e6f5;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: #c298d8;
   color: #151515;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #151515;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #151515;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 #c298d8;
 }
@@ -2064,20 +2101,15 @@
   padding: 1.25rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: rgba(255, 255, 255, 0.6);
-  border-radius: 4px;
-  transition: color 0.15s, box-shadow 0.15s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 1px #f0e6f5;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: rgba(255, 255, 255, 0.87);
-}
 
 .p-paginator {
   background: #2a323d;
@@ -2244,11 +2276,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: color 0.15s, box-shadow 0.15s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: transparent;
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #f0e6f5;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2381,12 +2425,24 @@
   padding: 1rem 1rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
-  margin-right: 0.5rem;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: color 0.15s, box-shadow 0.15s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: transparent;
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #f0e6f5;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2581,7 +2637,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: box-shadow 0.15s;
+  transition: color 0.15s, box-shadow 0.15s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 1rem 1.25rem;
@@ -2618,12 +2674,12 @@
   width: 2rem;
   height: 2rem;
   color: rgba(255, 255, 255, 0.6);
-  background: transparent;
   border: 0 none;
-  border-radius: 4px;
+  background: transparent;
+  border-radius: 50%;
   transition: color 0.15s, box-shadow 0.15s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: transparent;
@@ -2736,11 +2792,11 @@
   color: rgba(255, 255, 255, 0.6);
   border: 0 none;
   background: transparent;
-  border-radius: 4px;
+  border-radius: 50%;
   transition: color 0.15s, box-shadow 0.15s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: transparent;
@@ -2787,21 +2843,19 @@
   padding: 1rem;
 }
 .p-overlaypanel .p-overlaypanel-close {
-  background: #2a323d;
-  border: 1px solid #3f4b5b;
-  color: rgba(255, 255, 255, 0.6);
+  background: #c298d8;
+  color: #151515;
   width: 2rem;
   height: 2rem;
+  transition: color 0.15s, box-shadow 0.15s;
+  border-radius: 50%;
   position: absolute;
   top: -1rem;
   right: -1rem;
-  border-radius: 50%;
-  transition: color 0.15s, box-shadow 0.15s;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
-  background: #2a323d;
-  border-color: 1px solid #3f4b5b;
-  color: rgba(255, 255, 255, 0.87);
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
+  background: #aa70c7;
+  color: #151515;
 }
 .p-overlaypanel:after {
   border: solid transparent;
@@ -2828,18 +2882,23 @@
   box-shadow: none;
 }
 .p-sidebar .p-sidebar-close {
-  background: transparent;
-  border: 0 none;
-  color: rgba(255, 255, 255, 0.6);
   width: 2rem;
   height: 2rem;
-  border-radius: 4px;
+  color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: color 0.15s, box-shadow 0.15s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: transparent;
-  border-color: transparent;
+.p-sidebar .p-sidebar-close:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: transparent;
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #f0e6f5;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3318,21 +3377,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
+    width: 2rem;
+    height: 2rem;
     color: rgba(255, 255, 255, 0.6);
-    background: transparent;
-    border: 1px solid #3f4b5b;
-    width: 2.5rem;
-    height: 2.5rem;
-    border-radius: 4px;
+    border-radius: 50%;
     transition: color 0.15s, box-shadow 0.15s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1.25rem;
-  }
   .p-menubar .p-menubar-button:hover {
     color: rgba(255, 255, 255, 0.87);
     background: transparent;
-    border-color: rgba(255, 255, 255, 0.6);
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3767,6 +3820,21 @@
 .p-message .p-message-wrapper {
   padding: 1rem 1.25rem;
 }
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: color 0.15s, box-shadow 0.15s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #f0e6f5;
+}
 .p-message.p-message-info {
   background: #cce5ff;
   border: solid #b8daff;
@@ -3777,7 +3845,6 @@
   color: #004085;
 }
 .p-message.p-message-info .p-message-close {
-  background: #cce5ff;
   color: #004085;
 }
 .p-message.p-message-success {
@@ -3790,7 +3857,6 @@
   color: #155724;
 }
 .p-message.p-message-success .p-message-close {
-  background: #d4edda;
   color: #155724;
 }
 .p-message.p-message-warn {
@@ -3803,7 +3869,6 @@
   color: #856404;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #fff3cd;
   color: #856404;
 }
 .p-message.p-message-error {
@@ -3816,23 +3881,8 @@
   color: #721c24;
 }
 .p-message.p-message-error .p-message-close {
-  background: #f8d7da;
   color: #721c24;
 }
-.p-message .p-message-close {
-  border-radius: 4px;
-  width: 2rem;
-  height: 2rem;
-  transition: color 0.15s, box-shadow 0.15s;
-}
-.p-message .p-message-close:hover {
-  background: rgba(255, 255, 255, 0.2);
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: 0 0 0 1px #f0e6f5;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: 500;
@@ -3867,13 +3917,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
-  border-radius: 4px;
   width: 2rem;
   height: 2rem;
+  border-radius: 50%;
+  background: transparent;
   transition: color 0.15s, box-shadow 0.15s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: rgba(255, 255, 255, 0.2);
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #f0e6f5;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #cce5ff;
diff --git a/public/themes/bootstrap4-light-blue/theme.css b/public/themes/bootstrap4-light-blue/theme.css
index 9f9d381ed..bc0d96db2 100644
--- a/public/themes/bootstrap4-light-blue/theme.css
+++ b/public/themes/bootstrap4-light-blue/theme.css
@@ -3,7 +3,7 @@
   --surface-a: #ffffff;
   --surface-b: rgba(0, 0, 0, 0.03);
   --surface-c: #e9ecef;
-  --surface-d: rgba(0, 0, 0, 0.125);
+  --surface-d: #dee2e6;
   --surface-e: #ffffff;
   --surface-f: #ffffff;
   --text-color: #212529;
@@ -152,26 +152,32 @@
   background: #ffffff;
   font-weight: 600;
   margin: 0;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.125);
+  border-bottom: 1px solid #dee2e6;
   border-top-right-radius: 4px;
   border-top-left-radius: 4px;
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: #6c757d;
   border: 0 none;
   background: transparent;
-  border-radius: 4px;
-  transition: color 0.15s, box-shadow 0.15s;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
-  color: #212529;
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
+  color: #495057;
   border-color: transparent;
   background: transparent;
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -228,27 +234,34 @@
 }
 .p-datepicker .p-datepicker-buttonbar {
   padding: 1rem 0;
-  border-top: 1px solid rgba(0, 0, 0, 0.125);
+  border-top: 1px solid #dee2e6;
 }
 .p-datepicker .p-datepicker-buttonbar .p-button {
   width: auto;
 }
 .p-datepicker .p-timepicker {
-  border-top: 1px solid rgba(0, 0, 0, 0.125);
+  border-top: 1px solid #dee2e6;
   padding: 0.5rem;
 }
 .p-datepicker .p-timepicker button {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: #6c757d;
+  border: 0 none;
   background: transparent;
-  border-radius: 4px;
-  transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
 }
-.p-datepicker .p-timepicker button:hover {
-  color: #212529;
+.p-datepicker .p-timepicker button:enabled:hover {
+  color: #495057;
+  border-color: transparent;
   background: transparent;
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -274,7 +287,7 @@
   background: #007bff;
 }
 .p-datepicker.p-datepicker-multiple-month .p-datepicker-group {
-  border-right: 1px solid rgba(0, 0, 0, 0.125);
+  border-right: 1px solid #dee2e6;
   padding-right: 0;
   padding-left: 0;
   padding-top: 0;
@@ -287,10 +300,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: #212529;
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: #e9ecef;
 }
@@ -472,7 +481,7 @@
 }
 .p-dropdown-panel .p-dropdown-header {
   padding: 0.75rem 1.5rem;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.125);
+  border-bottom: 1px solid #dee2e6;
   color: #212529;
   background: rgba(0, 0, 0, 0.03);
   margin: 0;
@@ -527,7 +536,7 @@
   border-top-left-radius: 4px;
 }
 .p-editor-container .p-editor-toolbar.ql-snow {
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
 }
 .p-editor-container .p-editor-toolbar.ql-snow .ql-stroke {
   stroke: #6c757d;
@@ -577,7 +586,7 @@
   border-bottom-left-radius: 4px;
 }
 .p-editor-container .p-editor-content.ql-snow {
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
 }
 .p-editor-container .p-editor-content .ql-editor {
   background: #ffffff;
@@ -797,7 +806,7 @@
 }
 .p-listbox .p-listbox-header {
   padding: 0.75rem 1.5rem;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.125);
+  border-bottom: 1px solid #dee2e6;
   color: #212529;
   background: rgba(0, 0, 0, 0.03);
   margin: 0;
@@ -879,7 +888,7 @@
 }
 .p-multiselect-panel .p-multiselect-header {
   padding: 0.75rem 1.5rem;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.125);
+  border-bottom: 1px solid #dee2e6;
   color: #212529;
   background: rgba(0, 0, 0, 0.03);
   margin: 0;
@@ -902,15 +911,19 @@
   color: #6c757d;
   border: 0 none;
   background: transparent;
-  border-radius: 4px;
-  transition: color 0.15s, box-shadow 0.15s;
-  margin-left: 0.5rem;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
-  color: #212529;
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
+  color: #495057;
   border-color: transparent;
   background: transparent;
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0.5rem 0;
 }
@@ -1612,20 +1625,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: #ffffff;
-  border: 0 none;
-  color: #6c757d;
-  border-radius: 4px;
   width: 2rem;
   height: 2rem;
-  transition: color 0.15s, box-shadow 0.15s;
-  margin: 0.5rem;
+  color: #6c757d;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
+  margin: 0 0.5rem;
 }
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: #ffffff;
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
+  color: #495057;
   border-color: transparent;
-  color: #212529;
+  background: transparent;
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1638,11 +1657,11 @@
   background-color: #e9ecef;
   width: 2rem;
   height: 0.5rem;
-  transition: color 0.15s, box-shadow 0.15s;
+  transition: box-shadow 0.15s;
   border-radius: 0;
 }
 .p-carousel .p-carousel-indicators .p-carousel-indicator button:hover {
-  background: rgba(0, 0, 0, 0.125);
+  background: #dee2e6;
 }
 .p-carousel .p-carousel-indicators .p-carousel-indicator.p-highlight button {
   background: #007bff;
@@ -1734,23 +1753,41 @@
   border-width: 1px 0 0 0;
   padding: 1rem 1rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
   color: #6c757d;
-  transition: color 0.15s, box-shadow 0.15s;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
-  color: #212529;
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
+  color: #495057;
+  border-color: transparent;
+  background: transparent;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: #007bff;
   color: #ffffff;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #ffffff;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #ffffff;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 #007bff;
 }
@@ -1859,7 +1896,7 @@
   padding: 0;
 }
 .p-dataview.p-dataview-list .p-dataview-content > .p-grid > div {
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   border-width: 1px 0 0 0;
 }
 .p-dataview .p-dataview-footer {
@@ -1875,19 +1912,19 @@
 
 .fc .fc-view-container th {
   background: rgba(0, 0, 0, 0.03);
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   color: #212529;
 }
 .fc .fc-view-container td.fc-widget-content {
   background: #ffffff;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   color: #212529;
 }
 .fc .fc-view-container td.fc-head-container {
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
 }
 .fc .fc-view-container .fc-row {
-  border-right: 1px solid rgba(0, 0, 0, 0.125);
+  border-right: 1px solid #dee2e6;
 }
 .fc .fc-view-container .fc-event {
   background: #0069d9;
@@ -1896,7 +1933,7 @@
 }
 .fc .fc-view-container .fc-divider {
   background: rgba(0, 0, 0, 0.03);
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
 }
 .fc .fc-toolbar .fc-button {
   color: #ffffff;
@@ -1982,7 +2019,7 @@
 .p-orderlist .p-orderlist-caption {
   background: rgba(0, 0, 0, 0.03);
   color: #212529;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   padding: 1rem 1.25rem;
   font-weight: 600;
   border-bottom: 0 none;
@@ -1990,7 +2027,7 @@
   border-top-left-radius: 4px;
 }
 .p-orderlist .p-orderlist-list {
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   background: #ffffff;
   color: #212529;
   padding: 0.5rem 0;
@@ -2047,42 +2084,37 @@
   color: #003e80;
 }
 .p-organizationchart .p-organizationchart-line-down {
-  background: rgba(0, 0, 0, 0.125);
+  background: #dee2e6;
 }
 .p-organizationchart .p-organizationchart-line-left {
-  border-right: 1px solid rgba(0, 0, 0, 0.125);
-  border-color: rgba(0, 0, 0, 0.125);
+  border-right: 1px solid #dee2e6;
+  border-color: #dee2e6;
 }
 .p-organizationchart .p-organizationchart-line-top {
-  border-top: 1px solid rgba(0, 0, 0, 0.125);
-  border-color: rgba(0, 0, 0, 0.125);
+  border-top: 1px solid #dee2e6;
+  border-color: #dee2e6;
 }
 .p-organizationchart .p-organizationchart-node-content {
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   background: #ffffff;
   color: #212529;
   padding: 1.25rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: #6c757d;
-  border-radius: 4px;
-  transition: color 0.15s, box-shadow 0.15s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: #212529;
-}
 
 .p-paginator {
   background: #ffffff;
   color: #007bff;
-  border: solid rgba(0, 0, 0, 0.125);
+  border: solid #dee2e6;
   border-width: 0;
   padding: 0.75rem;
   border-radius: 4px;
@@ -2162,7 +2194,7 @@
 .p-picklist .p-picklist-caption {
   background: rgba(0, 0, 0, 0.03);
   color: #212529;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   padding: 1rem 1.25rem;
   font-weight: 600;
   border-bottom: 0 none;
@@ -2170,7 +2202,7 @@
   border-top-left-radius: 4px;
 }
 .p-picklist .p-picklist-list {
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   background: #ffffff;
   color: #212529;
   padding: 0.5rem 0;
@@ -2228,7 +2260,7 @@
   }
 }
 .p-tree {
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   background: #ffffff;
   color: #212529;
   padding: 1.25rem;
@@ -2244,11 +2276,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
   color: #6c757d;
-  transition: color 0.15s, box-shadow 0.15s;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
-  color: #212529;
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
+  color: #495057;
+  border-color: transparent;
+  background: transparent;
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2381,12 +2425,24 @@
   padding: 1rem 1rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
+  width: 2rem;
+  height: 2rem;
   color: #6c757d;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
   margin-right: 0.5rem;
-  transition: color 0.15s, box-shadow 0.15s;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
-  color: #212529;
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
+  color: #495057;
+  border-color: transparent;
+  background: transparent;
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2475,7 +2531,7 @@
 
 .p-accordion .p-accordion-header .p-accordion-header-link {
   padding: 1rem 1.25rem;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   color: #212529;
   background: rgba(0, 0, 0, 0.03);
   font-weight: 600;
@@ -2492,24 +2548,24 @@
 }
 .p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
   background: #e9ecef;
-  border-color: rgba(0, 0, 0, 0.125);
+  border-color: #dee2e6;
   color: #212529;
 }
 .p-accordion .p-accordion-header:not(.p-disabled).p-highlight .p-accordion-header-link {
   background: rgba(0, 0, 0, 0.03);
-  border-color: rgba(0, 0, 0, 0.125);
+  border-color: #dee2e6;
   color: #212529;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
 .p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
-  border-color: rgba(0, 0, 0, 0.125);
+  border-color: #dee2e6;
   background: #e9ecef;
   color: #212529;
 }
 .p-accordion .p-accordion-content {
   padding: 1.25rem;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   background: #ffffff;
   color: #212529;
   border-top: 0;
@@ -2566,14 +2622,14 @@
 }
 
 .p-fieldset {
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   background: #ffffff;
   color: #212529;
   border-radius: 4px;
 }
 .p-fieldset .p-fieldset-legend {
   padding: 1rem 1.25rem;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   color: #212529;
   background: rgba(0, 0, 0, 0.03);
   font-weight: 600;
@@ -2599,12 +2655,12 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend:hover {
   background: #e9ecef;
-  border-color: rgba(0, 0, 0, 0.125);
+  border-color: #dee2e6;
   color: #212529;
 }
 
 .p-panel .p-panel-header {
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   padding: 1rem 1.25rem;
   background: rgba(0, 0, 0, 0.03);
   color: #212529;
@@ -2618,13 +2674,13 @@
   width: 2rem;
   height: 2rem;
   color: #6c757d;
-  background: transparent;
   border: 0 none;
-  border-radius: 4px;
-  transition: color 0.15s, box-shadow 0.15s;
+  background: transparent;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
-  color: #212529;
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
+  color: #495057;
   border-color: transparent;
   background: transparent;
 }
@@ -2638,7 +2694,7 @@
 }
 .p-panel .p-panel-content {
   padding: 1.25rem;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   background: #ffffff;
   color: #212529;
   border-bottom-right-radius: 4px;
@@ -2647,7 +2703,7 @@
 }
 .p-panel .p-panel-footer {
   padding: 0.5rem 1.25rem;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   background: #ffffff;
   color: #212529;
   border-top: 0 none;
@@ -2705,7 +2761,7 @@
 
 .p-toolbar {
   background: rgba(0, 0, 0, 0.03);
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   padding: 1rem 1.25rem;
   border-radius: 4px;
 }
@@ -2736,12 +2792,12 @@
   color: #6c757d;
   border: 0 none;
   background: transparent;
-  border-radius: 4px;
-  transition: color 0.15s, box-shadow 0.15s;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
-  color: #212529;
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
+  color: #495057;
   border-color: transparent;
   background: transparent;
 }
@@ -2787,21 +2843,19 @@
   padding: 1rem;
 }
 .p-overlaypanel .p-overlaypanel-close {
-  background: #ffffff;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-  color: #6c757d;
+  background: #007bff;
+  color: #ffffff;
   width: 2rem;
   height: 2rem;
+  transition: box-shadow 0.15s;
+  border-radius: 50%;
   position: absolute;
   top: -1rem;
   right: -1rem;
-  border-radius: 50%;
-  transition: color 0.15s, box-shadow 0.15s;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
-  background: #ffffff;
-  border-color: rgba(0, 0, 0, 0.2);
-  color: #212529;
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
+  background: #0069d9;
+  color: #ffffff;
 }
 .p-overlaypanel:after {
   border: solid transparent;
@@ -2828,18 +2882,23 @@
   box-shadow: none;
 }
 .p-sidebar .p-sidebar-close {
-  background: transparent;
-  border: 0 none;
-  color: #6c757d;
   width: 2rem;
   height: 2rem;
-  border-radius: 4px;
-  transition: color 0.15s, box-shadow 0.15s;
-}
-.p-sidebar .p-sidebar-close:hover {
+  color: #6c757d;
+  border: 0 none;
   background: transparent;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
+}
+.p-sidebar .p-sidebar-close:enabled:hover {
+  color: #495057;
   border-color: transparent;
-  color: #212529;
+  background: transparent;
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -2869,7 +2928,7 @@
 .p-fileupload .p-fileupload-buttonbar {
   background: rgba(0, 0, 0, 0.03);
   padding: 1rem 1.25rem;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   color: #212529;
   border-bottom: 0 none;
   border-top-right-radius: 4px;
@@ -2886,7 +2945,7 @@
 .p-fileupload .p-fileupload-content {
   background: #ffffff;
   padding: 2rem 1rem;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   color: #212529;
   border-bottom-right-radius: 4px;
   border-bottom-left-radius: 4px;
@@ -2999,7 +3058,7 @@
   color: #212529;
 }
 .p-contextmenu .p-menu-separator {
-  border-top: 1px solid rgba(0, 0, 0, 0.125);
+  border-top: 1px solid #dee2e6;
   margin: 0.5rem 0;
 }
 .p-contextmenu .p-submenu-icon {
@@ -3118,7 +3177,7 @@
   width: 12.5rem;
 }
 .p-megamenu .p-megamenu-submenu .p-menu-separator {
-  border-top: 1px solid rgba(0, 0, 0, 0.125);
+  border-top: 1px solid #dee2e6;
   margin: 0.5rem 0;
 }
 .p-megamenu .p-menuitem.p-menuitem-active > .p-menuitem-link {
@@ -3139,7 +3198,7 @@
   padding: 0.5rem 0;
   background: #ffffff;
   color: #212529;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   border-radius: 4px;
   width: 12.5rem;
 }
@@ -3192,7 +3251,7 @@
   border-top-left-radius: 0;
 }
 .p-menu .p-menu-separator {
-  border-top: 1px solid rgba(0, 0, 0, 0.125);
+  border-top: 1px solid #dee2e6;
   margin: 0.5rem 0;
 }
 
@@ -3296,7 +3355,7 @@
   width: 12.5rem;
 }
 .p-menubar .p-submenu-list .p-menu-separator {
-  border-top: 1px solid rgba(0, 0, 0, 0.125);
+  border-top: 1px solid #dee2e6;
   margin: 0.5rem 0;
 }
 .p-menubar .p-submenu-list .p-submenu-icon {
@@ -3318,21 +3377,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
+    width: 2rem;
+    height: 2rem;
     color: rgba(0, 0, 0, 0.5);
-    background: transparent;
-    border: 1px solid rgba(0, 0, 0, 0.1);
-    width: 2.5rem;
-    height: 2.5rem;
-    border-radius: 4px;
-    transition: color 0.15s, box-shadow 0.15s;
-  }
-  .p-menubar .p-menubar-button i {
-    font-size: 1.25rem;
+    border-radius: 50%;
+    transition: box-shadow 0.15s;
   }
   .p-menubar .p-menubar-button:hover {
-    color: rgba(0, 0, 0, 0.5);
+    color: rgba(0, 0, 0, 0.7);
     background: transparent;
-    border-color: rgba(0, 0, 0, 0.1);
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3349,7 +3402,7 @@
     width: 100%;
   }
   .p-menubar .p-menubar-root-list .p-menu-separator {
-    border-top: 1px solid rgba(0, 0, 0, 0.125);
+    border-top: 1px solid #dee2e6;
     margin: 0.5rem 0;
   }
   .p-menubar .p-menubar-root-list .p-submenu-icon {
@@ -3442,7 +3495,7 @@
 }
 .p-panelmenu .p-panelmenu-header > a {
   padding: 1rem 1.25rem;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   color: #212529;
   background: rgba(0, 0, 0, 0.03);
   font-weight: 600;
@@ -3462,7 +3515,7 @@
 }
 .p-panelmenu .p-panelmenu-header:not(.p-highlight):not(.p-disabled) > a:hover {
   background: #e9ecef;
-  border-color: rgba(0, 0, 0, 0.125);
+  border-color: #dee2e6;
   color: #212529;
 }
 .p-panelmenu .p-panelmenu-header.p-highlight {
@@ -3470,19 +3523,19 @@
 }
 .p-panelmenu .p-panelmenu-header.p-highlight > a {
   background: rgba(0, 0, 0, 0.03);
-  border-color: rgba(0, 0, 0, 0.125);
+  border-color: #dee2e6;
   color: #212529;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
 .p-panelmenu .p-panelmenu-header.p-highlight:not(.p-disabled) > a:hover {
-  border-color: rgba(0, 0, 0, 0.125);
+  border-color: #dee2e6;
   background: #e9ecef;
   color: #212529;
 }
 .p-panelmenu .p-panelmenu-content {
   padding: 0.5rem 0;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   background: #ffffff;
   color: #212529;
   margin-bottom: 0;
@@ -3561,7 +3614,7 @@
 }
 .p-steps .p-steps-item .p-menuitem-link .p-steps-number {
   color: #212529;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   background: transparent;
   min-width: 2rem;
   height: 2rem;
@@ -3589,7 +3642,7 @@
 }
 .p-steps .p-steps-item:before {
   content: " ";
-  border-top: 1px solid rgba(0, 0, 0, 0.125);
+  border-top: 1px solid #dee2e6;
   width: 100%;
   top: 50%;
   left: 0;
@@ -3642,7 +3695,7 @@
   padding: 0.5rem 0;
   background: #ffffff;
   color: #212529;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   border-radius: 4px;
   width: 12.5rem;
 }
@@ -3701,7 +3754,7 @@
   color: #212529;
 }
 .p-tieredmenu .p-menu-separator {
-  border-top: 1px solid rgba(0, 0, 0, 0.125);
+  border-top: 1px solid #dee2e6;
   margin: 0.5rem 0;
 }
 .p-tieredmenu .p-submenu-icon {
@@ -3767,6 +3820,21 @@
 .p-message .p-message-wrapper {
   padding: 1rem 1.25rem;
 }
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: box-shadow 0.15s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+}
 .p-message.p-message-info {
   background: #cce5ff;
   border: solid #b8daff;
@@ -3777,7 +3845,6 @@
   color: #004085;
 }
 .p-message.p-message-info .p-message-close {
-  background: #cce5ff;
   color: #004085;
 }
 .p-message.p-message-success {
@@ -3790,7 +3857,6 @@
   color: #155724;
 }
 .p-message.p-message-success .p-message-close {
-  background: #d4edda;
   color: #155724;
 }
 .p-message.p-message-warn {
@@ -3803,7 +3869,6 @@
   color: #856404;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #fff3cd;
   color: #856404;
 }
 .p-message.p-message-error {
@@ -3816,23 +3881,8 @@
   color: #721c24;
 }
 .p-message.p-message-error .p-message-close {
-  background: #f8d7da;
   color: #721c24;
 }
-.p-message .p-message-close {
-  border-radius: 4px;
-  width: 2rem;
-  height: 2rem;
-  transition: color 0.15s, box-shadow 0.15s;
-}
-.p-message .p-message-close:hover {
-  background: rgba(255, 255, 255, 0.2);
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: 500;
@@ -3867,13 +3917,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
-  border-radius: 4px;
   width: 2rem;
   height: 2rem;
-  transition: color 0.15s, box-shadow 0.15s;
+  border-radius: 50%;
+  background: transparent;
+  transition: box-shadow 0.15s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: rgba(255, 255, 255, 0.2);
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #cce5ff;
@@ -3922,7 +3978,7 @@
   color: rgba(0, 0, 0, 0.03);
   width: 4rem;
   height: 4rem;
-  transition: color 0.15s, box-shadow 0.15s;
+  transition: box-shadow 0.15s;
   border-radius: 4px;
 }
 .p-galleria .p-galleria-close .p-galleria-close-icon {
@@ -3937,7 +3993,7 @@
   color: rgba(0, 0, 0, 0.03);
   width: 4rem;
   height: 4rem;
-  transition: color 0.15s, box-shadow 0.15s;
+  transition: box-shadow 0.15s;
   border-radius: 4px;
   margin: 0 0.5rem;
 }
@@ -3961,11 +4017,11 @@
   background-color: #e9ecef;
   width: 1rem;
   height: 1rem;
-  transition: color 0.15s, box-shadow 0.15s;
+  transition: box-shadow 0.15s;
   border-radius: 4px;
 }
 .p-galleria .p-galleria-indicators .p-galleria-indicator button:hover {
-  background: rgba(0, 0, 0, 0.125);
+  background: #dee2e6;
 }
 .p-galleria .p-galleria-indicators .p-galleria-indicator.p-highlight button {
   background: #007bff;
@@ -4001,7 +4057,7 @@
   color: rgba(0, 0, 0, 0.03);
   width: 2rem;
   height: 2rem;
-  transition: color 0.15s, box-shadow 0.15s;
+  transition: box-shadow 0.15s;
   border-radius: 4px;
 }
 .p-galleria .p-galleria-thumbnail-container .p-galleria-thumbnail-prev:hover,
@@ -4056,7 +4112,7 @@
 .p-terminal {
   background: #ffffff;
   color: #212529;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   padding: 1.25rem;
 }
 .p-terminal .p-terminal-input {
diff --git a/public/themes/bootstrap4-light-purple/theme.css b/public/themes/bootstrap4-light-purple/theme.css
index ded34d8e7..26c61d011 100644
--- a/public/themes/bootstrap4-light-purple/theme.css
+++ b/public/themes/bootstrap4-light-purple/theme.css
@@ -3,7 +3,7 @@
   --surface-a: #ffffff;
   --surface-b: rgba(0, 0, 0, 0.03);
   --surface-c: #e9ecef;
-  --surface-d: rgba(0, 0, 0, 0.125);
+  --surface-d: #dee2e6;
   --surface-e: #ffffff;
   --surface-f: #ffffff;
   --text-color: #212529;
@@ -152,26 +152,32 @@
   background: #ffffff;
   font-weight: 600;
   margin: 0;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.125);
+  border-bottom: 1px solid #dee2e6;
   border-top-right-radius: 4px;
   border-top-left-radius: 4px;
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: #6c757d;
   border: 0 none;
   background: transparent;
-  border-radius: 4px;
-  transition: color 0.15s, box-shadow 0.15s;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
-  color: #212529;
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
+  color: #495057;
   border-color: transparent;
   background: transparent;
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(136, 60, 174, 0.5);
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -228,27 +234,34 @@
 }
 .p-datepicker .p-datepicker-buttonbar {
   padding: 1rem 0;
-  border-top: 1px solid rgba(0, 0, 0, 0.125);
+  border-top: 1px solid #dee2e6;
 }
 .p-datepicker .p-datepicker-buttonbar .p-button {
   width: auto;
 }
 .p-datepicker .p-timepicker {
-  border-top: 1px solid rgba(0, 0, 0, 0.125);
+  border-top: 1px solid #dee2e6;
   padding: 0.5rem;
 }
 .p-datepicker .p-timepicker button {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: #6c757d;
+  border: 0 none;
   background: transparent;
-  border-radius: 4px;
-  transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
 }
-.p-datepicker .p-timepicker button:hover {
-  color: #212529;
+.p-datepicker .p-timepicker button:enabled:hover {
+  color: #495057;
+  border-color: transparent;
   background: transparent;
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(136, 60, 174, 0.5);
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -274,7 +287,7 @@
   background: #883cae;
 }
 .p-datepicker.p-datepicker-multiple-month .p-datepicker-group {
-  border-right: 1px solid rgba(0, 0, 0, 0.125);
+  border-right: 1px solid #dee2e6;
   padding-right: 0;
   padding-left: 0;
   padding-top: 0;
@@ -287,10 +300,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: #212529;
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: #e9ecef;
 }
@@ -472,7 +481,7 @@
 }
 .p-dropdown-panel .p-dropdown-header {
   padding: 0.75rem 1.5rem;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.125);
+  border-bottom: 1px solid #dee2e6;
   color: #212529;
   background: rgba(0, 0, 0, 0.03);
   margin: 0;
@@ -527,7 +536,7 @@
   border-top-left-radius: 4px;
 }
 .p-editor-container .p-editor-toolbar.ql-snow {
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
 }
 .p-editor-container .p-editor-toolbar.ql-snow .ql-stroke {
   stroke: #6c757d;
@@ -577,7 +586,7 @@
   border-bottom-left-radius: 4px;
 }
 .p-editor-container .p-editor-content.ql-snow {
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
 }
 .p-editor-container .p-editor-content .ql-editor {
   background: #ffffff;
@@ -797,7 +806,7 @@
 }
 .p-listbox .p-listbox-header {
   padding: 0.75rem 1.5rem;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.125);
+  border-bottom: 1px solid #dee2e6;
   color: #212529;
   background: rgba(0, 0, 0, 0.03);
   margin: 0;
@@ -879,7 +888,7 @@
 }
 .p-multiselect-panel .p-multiselect-header {
   padding: 0.75rem 1.5rem;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.125);
+  border-bottom: 1px solid #dee2e6;
   color: #212529;
   background: rgba(0, 0, 0, 0.03);
   margin: 0;
@@ -902,15 +911,19 @@
   color: #6c757d;
   border: 0 none;
   background: transparent;
-  border-radius: 4px;
-  transition: color 0.15s, box-shadow 0.15s;
-  margin-left: 0.5rem;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
-  color: #212529;
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
+  color: #495057;
   border-color: transparent;
   background: transparent;
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(136, 60, 174, 0.5);
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0.5rem 0;
 }
@@ -1612,20 +1625,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: #ffffff;
-  border: 0 none;
-  color: #6c757d;
-  border-radius: 4px;
   width: 2rem;
   height: 2rem;
-  transition: color 0.15s, box-shadow 0.15s;
-  margin: 0.5rem;
+  color: #6c757d;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
+  margin: 0 0.5rem;
 }
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: #ffffff;
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
+  color: #495057;
   border-color: transparent;
-  color: #212529;
+  background: transparent;
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(136, 60, 174, 0.5);
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1638,11 +1657,11 @@
   background-color: #e9ecef;
   width: 2rem;
   height: 0.5rem;
-  transition: color 0.15s, box-shadow 0.15s;
+  transition: box-shadow 0.15s;
   border-radius: 0;
 }
 .p-carousel .p-carousel-indicators .p-carousel-indicator button:hover {
-  background: rgba(0, 0, 0, 0.125);
+  background: #dee2e6;
 }
 .p-carousel .p-carousel-indicators .p-carousel-indicator.p-highlight button {
   background: #883cae;
@@ -1734,23 +1753,41 @@
   border-width: 1px 0 0 0;
   padding: 1rem 1rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
   color: #6c757d;
-  transition: color 0.15s, box-shadow 0.15s;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
-  color: #212529;
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
+  color: #495057;
+  border-color: transparent;
+  background: transparent;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(136, 60, 174, 0.5);
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: #883cae;
   color: #ffffff;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #ffffff;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #ffffff;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 #883cae;
 }
@@ -1859,7 +1896,7 @@
   padding: 0;
 }
 .p-dataview.p-dataview-list .p-dataview-content > .p-grid > div {
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   border-width: 1px 0 0 0;
 }
 .p-dataview .p-dataview-footer {
@@ -1875,19 +1912,19 @@
 
 .fc .fc-view-container th {
   background: rgba(0, 0, 0, 0.03);
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   color: #212529;
 }
 .fc .fc-view-container td.fc-widget-content {
   background: #ffffff;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   color: #212529;
 }
 .fc .fc-view-container td.fc-head-container {
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
 }
 .fc .fc-view-container .fc-row {
-  border-right: 1px solid rgba(0, 0, 0, 0.125);
+  border-right: 1px solid #dee2e6;
 }
 .fc .fc-view-container .fc-event {
   background: #7a38a7;
@@ -1896,7 +1933,7 @@
 }
 .fc .fc-view-container .fc-divider {
   background: rgba(0, 0, 0, 0.03);
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
 }
 .fc .fc-toolbar .fc-button {
   color: #ffffff;
@@ -1982,7 +2019,7 @@
 .p-orderlist .p-orderlist-caption {
   background: rgba(0, 0, 0, 0.03);
   color: #212529;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   padding: 1rem 1.25rem;
   font-weight: 600;
   border-bottom: 0 none;
@@ -1990,7 +2027,7 @@
   border-top-left-radius: 4px;
 }
 .p-orderlist .p-orderlist-list {
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   background: #ffffff;
   color: #212529;
   padding: 0.5rem 0;
@@ -2047,42 +2084,37 @@
   color: #3e1b4f;
 }
 .p-organizationchart .p-organizationchart-line-down {
-  background: rgba(0, 0, 0, 0.125);
+  background: #dee2e6;
 }
 .p-organizationchart .p-organizationchart-line-left {
-  border-right: 1px solid rgba(0, 0, 0, 0.125);
-  border-color: rgba(0, 0, 0, 0.125);
+  border-right: 1px solid #dee2e6;
+  border-color: #dee2e6;
 }
 .p-organizationchart .p-organizationchart-line-top {
-  border-top: 1px solid rgba(0, 0, 0, 0.125);
-  border-color: rgba(0, 0, 0, 0.125);
+  border-top: 1px solid #dee2e6;
+  border-color: #dee2e6;
 }
 .p-organizationchart .p-organizationchart-node-content {
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   background: #ffffff;
   color: #212529;
   padding: 1.25rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: #6c757d;
-  border-radius: 4px;
-  transition: color 0.15s, box-shadow 0.15s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem rgba(136, 60, 174, 0.5);
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: #212529;
-}
 
 .p-paginator {
   background: #ffffff;
   color: #883cae;
-  border: solid rgba(0, 0, 0, 0.125);
+  border: solid #dee2e6;
   border-width: 0;
   padding: 0.75rem;
   border-radius: 4px;
@@ -2162,7 +2194,7 @@
 .p-picklist .p-picklist-caption {
   background: rgba(0, 0, 0, 0.03);
   color: #212529;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   padding: 1rem 1.25rem;
   font-weight: 600;
   border-bottom: 0 none;
@@ -2170,7 +2202,7 @@
   border-top-left-radius: 4px;
 }
 .p-picklist .p-picklist-list {
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   background: #ffffff;
   color: #212529;
   padding: 0.5rem 0;
@@ -2228,7 +2260,7 @@
   }
 }
 .p-tree {
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   background: #ffffff;
   color: #212529;
   padding: 1.25rem;
@@ -2244,11 +2276,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
   color: #6c757d;
-  transition: color 0.15s, box-shadow 0.15s;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
-  color: #212529;
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
+  color: #495057;
+  border-color: transparent;
+  background: transparent;
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(136, 60, 174, 0.5);
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2381,12 +2425,24 @@
   padding: 1rem 1rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
+  width: 2rem;
+  height: 2rem;
   color: #6c757d;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
   margin-right: 0.5rem;
-  transition: color 0.15s, box-shadow 0.15s;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
-  color: #212529;
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
+  color: #495057;
+  border-color: transparent;
+  background: transparent;
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(136, 60, 174, 0.5);
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2475,7 +2531,7 @@
 
 .p-accordion .p-accordion-header .p-accordion-header-link {
   padding: 1rem 1.25rem;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   color: #212529;
   background: rgba(0, 0, 0, 0.03);
   font-weight: 600;
@@ -2492,24 +2548,24 @@
 }
 .p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
   background: #e9ecef;
-  border-color: rgba(0, 0, 0, 0.125);
+  border-color: #dee2e6;
   color: #212529;
 }
 .p-accordion .p-accordion-header:not(.p-disabled).p-highlight .p-accordion-header-link {
   background: rgba(0, 0, 0, 0.03);
-  border-color: rgba(0, 0, 0, 0.125);
+  border-color: #dee2e6;
   color: #212529;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
 .p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
-  border-color: rgba(0, 0, 0, 0.125);
+  border-color: #dee2e6;
   background: #e9ecef;
   color: #212529;
 }
 .p-accordion .p-accordion-content {
   padding: 1.25rem;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   background: #ffffff;
   color: #212529;
   border-top: 0;
@@ -2566,14 +2622,14 @@
 }
 
 .p-fieldset {
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   background: #ffffff;
   color: #212529;
   border-radius: 4px;
 }
 .p-fieldset .p-fieldset-legend {
   padding: 1rem 1.25rem;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   color: #212529;
   background: rgba(0, 0, 0, 0.03);
   font-weight: 600;
@@ -2599,12 +2655,12 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend:hover {
   background: #e9ecef;
-  border-color: rgba(0, 0, 0, 0.125);
+  border-color: #dee2e6;
   color: #212529;
 }
 
 .p-panel .p-panel-header {
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   padding: 1rem 1.25rem;
   background: rgba(0, 0, 0, 0.03);
   color: #212529;
@@ -2618,13 +2674,13 @@
   width: 2rem;
   height: 2rem;
   color: #6c757d;
-  background: transparent;
   border: 0 none;
-  border-radius: 4px;
-  transition: color 0.15s, box-shadow 0.15s;
+  background: transparent;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
-  color: #212529;
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
+  color: #495057;
   border-color: transparent;
   background: transparent;
 }
@@ -2638,7 +2694,7 @@
 }
 .p-panel .p-panel-content {
   padding: 1.25rem;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   background: #ffffff;
   color: #212529;
   border-bottom-right-radius: 4px;
@@ -2647,7 +2703,7 @@
 }
 .p-panel .p-panel-footer {
   padding: 0.5rem 1.25rem;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   background: #ffffff;
   color: #212529;
   border-top: 0 none;
@@ -2705,7 +2761,7 @@
 
 .p-toolbar {
   background: rgba(0, 0, 0, 0.03);
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   padding: 1rem 1.25rem;
   border-radius: 4px;
 }
@@ -2736,12 +2792,12 @@
   color: #6c757d;
   border: 0 none;
   background: transparent;
-  border-radius: 4px;
-  transition: color 0.15s, box-shadow 0.15s;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
-  color: #212529;
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
+  color: #495057;
   border-color: transparent;
   background: transparent;
 }
@@ -2787,21 +2843,19 @@
   padding: 1rem;
 }
 .p-overlaypanel .p-overlaypanel-close {
-  background: #ffffff;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-  color: #6c757d;
+  background: #883cae;
+  color: #ffffff;
   width: 2rem;
   height: 2rem;
+  transition: box-shadow 0.15s;
+  border-radius: 50%;
   position: absolute;
   top: -1rem;
   right: -1rem;
-  border-radius: 50%;
-  transition: color 0.15s, box-shadow 0.15s;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
-  background: #ffffff;
-  border-color: rgba(0, 0, 0, 0.2);
-  color: #212529;
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
+  background: #7a38a7;
+  color: #ffffff;
 }
 .p-overlaypanel:after {
   border: solid transparent;
@@ -2828,18 +2882,23 @@
   box-shadow: none;
 }
 .p-sidebar .p-sidebar-close {
-  background: transparent;
-  border: 0 none;
-  color: #6c757d;
   width: 2rem;
   height: 2rem;
-  border-radius: 4px;
-  transition: color 0.15s, box-shadow 0.15s;
-}
-.p-sidebar .p-sidebar-close:hover {
+  color: #6c757d;
+  border: 0 none;
   background: transparent;
+  border-radius: 50%;
+  transition: box-shadow 0.15s;
+}
+.p-sidebar .p-sidebar-close:enabled:hover {
+  color: #495057;
   border-color: transparent;
-  color: #212529;
+  background: transparent;
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(136, 60, 174, 0.5);
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -2869,7 +2928,7 @@
 .p-fileupload .p-fileupload-buttonbar {
   background: rgba(0, 0, 0, 0.03);
   padding: 1rem 1.25rem;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   color: #212529;
   border-bottom: 0 none;
   border-top-right-radius: 4px;
@@ -2886,7 +2945,7 @@
 .p-fileupload .p-fileupload-content {
   background: #ffffff;
   padding: 2rem 1rem;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   color: #212529;
   border-bottom-right-radius: 4px;
   border-bottom-left-radius: 4px;
@@ -2999,7 +3058,7 @@
   color: #212529;
 }
 .p-contextmenu .p-menu-separator {
-  border-top: 1px solid rgba(0, 0, 0, 0.125);
+  border-top: 1px solid #dee2e6;
   margin: 0.5rem 0;
 }
 .p-contextmenu .p-submenu-icon {
@@ -3118,7 +3177,7 @@
   width: 12.5rem;
 }
 .p-megamenu .p-megamenu-submenu .p-menu-separator {
-  border-top: 1px solid rgba(0, 0, 0, 0.125);
+  border-top: 1px solid #dee2e6;
   margin: 0.5rem 0;
 }
 .p-megamenu .p-menuitem.p-menuitem-active > .p-menuitem-link {
@@ -3139,7 +3198,7 @@
   padding: 0.5rem 0;
   background: #ffffff;
   color: #212529;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   border-radius: 4px;
   width: 12.5rem;
 }
@@ -3192,7 +3251,7 @@
   border-top-left-radius: 0;
 }
 .p-menu .p-menu-separator {
-  border-top: 1px solid rgba(0, 0, 0, 0.125);
+  border-top: 1px solid #dee2e6;
   margin: 0.5rem 0;
 }
 
@@ -3296,7 +3355,7 @@
   width: 12.5rem;
 }
 .p-menubar .p-submenu-list .p-menu-separator {
-  border-top: 1px solid rgba(0, 0, 0, 0.125);
+  border-top: 1px solid #dee2e6;
   margin: 0.5rem 0;
 }
 .p-menubar .p-submenu-list .p-submenu-icon {
@@ -3318,21 +3377,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
+    width: 2rem;
+    height: 2rem;
     color: rgba(0, 0, 0, 0.5);
-    background: transparent;
-    border: 1px solid rgba(0, 0, 0, 0.1);
-    width: 2.5rem;
-    height: 2.5rem;
-    border-radius: 4px;
-    transition: color 0.15s, box-shadow 0.15s;
-  }
-  .p-menubar .p-menubar-button i {
-    font-size: 1.25rem;
+    border-radius: 50%;
+    transition: box-shadow 0.15s;
   }
   .p-menubar .p-menubar-button:hover {
-    color: rgba(0, 0, 0, 0.5);
+    color: rgba(0, 0, 0, 0.7);
     background: transparent;
-    border-color: rgba(0, 0, 0, 0.1);
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3349,7 +3402,7 @@
     width: 100%;
   }
   .p-menubar .p-menubar-root-list .p-menu-separator {
-    border-top: 1px solid rgba(0, 0, 0, 0.125);
+    border-top: 1px solid #dee2e6;
     margin: 0.5rem 0;
   }
   .p-menubar .p-menubar-root-list .p-submenu-icon {
@@ -3442,7 +3495,7 @@
 }
 .p-panelmenu .p-panelmenu-header > a {
   padding: 1rem 1.25rem;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   color: #212529;
   background: rgba(0, 0, 0, 0.03);
   font-weight: 600;
@@ -3462,7 +3515,7 @@
 }
 .p-panelmenu .p-panelmenu-header:not(.p-highlight):not(.p-disabled) > a:hover {
   background: #e9ecef;
-  border-color: rgba(0, 0, 0, 0.125);
+  border-color: #dee2e6;
   color: #212529;
 }
 .p-panelmenu .p-panelmenu-header.p-highlight {
@@ -3470,19 +3523,19 @@
 }
 .p-panelmenu .p-panelmenu-header.p-highlight > a {
   background: rgba(0, 0, 0, 0.03);
-  border-color: rgba(0, 0, 0, 0.125);
+  border-color: #dee2e6;
   color: #212529;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
 .p-panelmenu .p-panelmenu-header.p-highlight:not(.p-disabled) > a:hover {
-  border-color: rgba(0, 0, 0, 0.125);
+  border-color: #dee2e6;
   background: #e9ecef;
   color: #212529;
 }
 .p-panelmenu .p-panelmenu-content {
   padding: 0.5rem 0;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   background: #ffffff;
   color: #212529;
   margin-bottom: 0;
@@ -3561,7 +3614,7 @@
 }
 .p-steps .p-steps-item .p-menuitem-link .p-steps-number {
   color: #212529;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   background: transparent;
   min-width: 2rem;
   height: 2rem;
@@ -3589,7 +3642,7 @@
 }
 .p-steps .p-steps-item:before {
   content: " ";
-  border-top: 1px solid rgba(0, 0, 0, 0.125);
+  border-top: 1px solid #dee2e6;
   width: 100%;
   top: 50%;
   left: 0;
@@ -3642,7 +3695,7 @@
   padding: 0.5rem 0;
   background: #ffffff;
   color: #212529;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   border-radius: 4px;
   width: 12.5rem;
 }
@@ -3701,7 +3754,7 @@
   color: #212529;
 }
 .p-tieredmenu .p-menu-separator {
-  border-top: 1px solid rgba(0, 0, 0, 0.125);
+  border-top: 1px solid #dee2e6;
   margin: 0.5rem 0;
 }
 .p-tieredmenu .p-submenu-icon {
@@ -3767,6 +3820,21 @@
 .p-message .p-message-wrapper {
   padding: 1rem 1.25rem;
 }
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: box-shadow 0.15s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(136, 60, 174, 0.5);
+}
 .p-message.p-message-info {
   background: #cce5ff;
   border: solid #b8daff;
@@ -3777,7 +3845,6 @@
   color: #004085;
 }
 .p-message.p-message-info .p-message-close {
-  background: #cce5ff;
   color: #004085;
 }
 .p-message.p-message-success {
@@ -3790,7 +3857,6 @@
   color: #155724;
 }
 .p-message.p-message-success .p-message-close {
-  background: #d4edda;
   color: #155724;
 }
 .p-message.p-message-warn {
@@ -3803,7 +3869,6 @@
   color: #856404;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #fff3cd;
   color: #856404;
 }
 .p-message.p-message-error {
@@ -3816,23 +3881,8 @@
   color: #721c24;
 }
 .p-message.p-message-error .p-message-close {
-  background: #f8d7da;
   color: #721c24;
 }
-.p-message .p-message-close {
-  border-radius: 4px;
-  width: 2rem;
-  height: 2rem;
-  transition: color 0.15s, box-shadow 0.15s;
-}
-.p-message .p-message-close:hover {
-  background: rgba(255, 255, 255, 0.2);
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: 0 0 0 0.2rem rgba(136, 60, 174, 0.5);
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: 500;
@@ -3867,13 +3917,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
-  border-radius: 4px;
   width: 2rem;
   height: 2rem;
-  transition: color 0.15s, box-shadow 0.15s;
+  border-radius: 50%;
+  background: transparent;
+  transition: box-shadow 0.15s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: rgba(255, 255, 255, 0.2);
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem rgba(136, 60, 174, 0.5);
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #cce5ff;
@@ -3922,7 +3978,7 @@
   color: rgba(0, 0, 0, 0.03);
   width: 4rem;
   height: 4rem;
-  transition: color 0.15s, box-shadow 0.15s;
+  transition: box-shadow 0.15s;
   border-radius: 4px;
 }
 .p-galleria .p-galleria-close .p-galleria-close-icon {
@@ -3937,7 +3993,7 @@
   color: rgba(0, 0, 0, 0.03);
   width: 4rem;
   height: 4rem;
-  transition: color 0.15s, box-shadow 0.15s;
+  transition: box-shadow 0.15s;
   border-radius: 4px;
   margin: 0 0.5rem;
 }
@@ -3961,11 +4017,11 @@
   background-color: #e9ecef;
   width: 1rem;
   height: 1rem;
-  transition: color 0.15s, box-shadow 0.15s;
+  transition: box-shadow 0.15s;
   border-radius: 4px;
 }
 .p-galleria .p-galleria-indicators .p-galleria-indicator button:hover {
-  background: rgba(0, 0, 0, 0.125);
+  background: #dee2e6;
 }
 .p-galleria .p-galleria-indicators .p-galleria-indicator.p-highlight button {
   background: #883cae;
@@ -4001,7 +4057,7 @@
   color: rgba(0, 0, 0, 0.03);
   width: 2rem;
   height: 2rem;
-  transition: color 0.15s, box-shadow 0.15s;
+  transition: box-shadow 0.15s;
   border-radius: 4px;
 }
 .p-galleria .p-galleria-thumbnail-container .p-galleria-thumbnail-prev:hover,
@@ -4056,7 +4112,7 @@
 .p-terminal {
   background: #ffffff;
   color: #212529;
-  border: 1px solid rgba(0, 0, 0, 0.125);
+  border: 1px solid #dee2e6;
   padding: 1.25rem;
 }
 .p-terminal .p-terminal-input {
diff --git a/public/themes/luna-amber/theme.css b/public/themes/luna-amber/theme.css
index d79a00929..a53957f08 100644
--- a/public/themes/luna-amber/theme.css
+++ b/public/themes/luna-amber/theme.css
@@ -3,7 +3,7 @@
   --surface-a: #191919;
   --surface-b: #191919;
   --surface-c: #4c4c4c;
-  --surface-d: #2f2f2f;
+  --surface-d: #4b4b4b;
   --surface-e: #323232;
   --surface-f: #323232;
   --text-color: #dedede;
@@ -158,20 +158,26 @@
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: auto;
-  height: auto;
-  color: #888888;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
   border: 0 none;
   background: transparent;
-  border-radius: 3px;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: #dedede;
   border-color: transparent;
   background: transparent;
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -238,17 +244,24 @@
   padding: 0.857rem 0 0.429rem 0;
 }
 .p-datepicker .p-timepicker button {
-  width: auto;
-  height: auto;
-  color: #888888;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
+  border: 0 none;
   background: transparent;
-  border-radius: 3px;
-  transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: #dedede;
+  border-color: transparent;
   background: transparent;
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -287,10 +300,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: #dedede;
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: #4c4c4c;
 }
@@ -897,20 +906,24 @@
   margin-right: 0.5rem;
 }
 .p-multiselect-panel .p-multiselect-header .p-multiselect-close {
-  width: auto;
-  height: auto;
-  color: #888888;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
   border: 0 none;
   background: transparent;
-  border-radius: 3px;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
   color: #dedede;
   border-color: transparent;
   background: transparent;
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0;
 }
@@ -1612,20 +1625,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: transparent;
-  border: 0 none;
-  color: #888888;
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  color: #8888;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin: 0.5rem;
+  margin: 0 0.5rem;
 }
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: #4c4c4c;
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
+  color: #dedede;
   border-color: transparent;
-  color: #888888;
+  background: transparent;
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1734,23 +1753,41 @@
   border-width: 1px;
   padding: 0.571rem 0.857rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
-  color: #888888;
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
   color: #dedede;
+  border-color: transparent;
+  background: transparent;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: #FFE082;
   color: #212529;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #212529;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #212529;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 #FFE082;
 }
@@ -2064,20 +2101,15 @@
   padding: 0.571rem 1rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: #888888;
-  border-radius: 3px;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.1rem white;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: #dedede;
-}
 
 .p-paginator {
   background: #252525;
@@ -2244,11 +2276,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
-  color: #888888;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
   color: #dedede;
+  border-color: transparent;
+  background: transparent;
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2381,12 +2425,24 @@
   padding: 0.571rem 0.857rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
-  color: #888888;
-  margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
   color: #dedede;
+  border-color: transparent;
+  background: transparent;
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2564,7 +2620,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 0.857rem 1rem;
@@ -2598,15 +2654,15 @@
   font-weight: 700;
 }
 .p-panel .p-panel-header .p-panel-header-icon {
-  width: auto;
-  height: auto;
-  color: #888888;
-  background: transparent;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
   border: 0 none;
-  border-radius: 3px;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
   color: #dedede;
   border-color: transparent;
   background: transparent;
@@ -2714,16 +2770,16 @@
   font-size: 1rem;
 }
 .p-dialog .p-dialog-header .p-dialog-header-icon {
-  width: auto;
-  height: auto;
-  color: #888888;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
   border: 0 none;
   background: transparent;
-  border-radius: 3px;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
   color: #dedede;
   border-color: transparent;
   background: transparent;
@@ -2771,19 +2827,17 @@
 }
 .p-overlaypanel .p-overlaypanel-close {
   background: #FFE082;
-  border: 0 none;
   color: #212529;
-  width: 1.538rem;
-  height: 1.538rem;
-  position: absolute;
-  top: -0.769rem;
-  right: -0.769rem;
-  border-radius: 50%;
+  width: 2rem;
+  height: 2rem;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
+  position: absolute;
+  top: -1rem;
+  right: -1rem;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
-  background: #FFCA28;
-  border-color: transparent;
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
+  background: #FFD54F;
   color: #212529;
 }
 .p-overlaypanel:after {
@@ -2811,18 +2865,23 @@
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.16);
 }
 .p-sidebar .p-sidebar-close {
-  background: #FFE082;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
   border: 0 none;
-  color: #212529;
-  width: 1.538rem;
-  height: 1.538rem;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: #FFCA28;
+.p-sidebar .p-sidebar-close:enabled:hover {
+  color: #dedede;
   border-color: transparent;
-  color: #212529;
+  background: transparent;
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3301,21 +3360,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
-    color: #888888;
-    background: transparent;
-    border: 0 none;
     width: 2rem;
     height: 2rem;
+    color: #dedede;
     border-radius: 50%;
     transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1rem;
-  }
   .p-menubar .p-menubar-button:hover {
     color: #dedede;
-    background: transparent;
-    border-color: transparent;
+    background: #4c4c4c;
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3733,6 +3786,21 @@
 .p-message .p-message-wrapper {
   padding: 1rem;
 }
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
+}
 .p-message.p-message-info {
   background: #7fbcec;
   border: 0 none;
@@ -3743,7 +3811,6 @@
   color: #212121;
 }
 .p-message.p-message-info .p-message-close {
-  background: #7fbcec;
   color: #212121;
 }
 .p-message.p-message-success {
@@ -3756,7 +3823,6 @@
   color: #212121;
 }
 .p-message.p-message-success .p-message-close {
-  background: #b7d8b7;
   color: #212121;
 }
 .p-message.p-message-warn {
@@ -3769,7 +3835,6 @@
   color: #212121;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #ffe399;
   color: #212121;
 }
 .p-message.p-message-error {
@@ -3782,23 +3847,8 @@
   color: #212121;
 }
 .p-message.p-message-error .p-message-close {
-  background: #f8b7bd;
   color: #212121;
 }
-.p-message .p-message-close {
-  border-radius: 3px;
-  width: auto;
-  height: auto;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-}
-.p-message .p-message-close:hover {
-  background: transparent;
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: 0 0 0 0.1rem white;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: normal;
@@ -3833,13 +3883,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
-  border-radius: 3px;
-  width: auto;
-  height: auto;
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: transparent;
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #7fbcec;
diff --git a/public/themes/luna-blue/theme.css b/public/themes/luna-blue/theme.css
index 4f0e3b4ec..5f489eae9 100644
--- a/public/themes/luna-blue/theme.css
+++ b/public/themes/luna-blue/theme.css
@@ -3,7 +3,7 @@
   --surface-a: #191919;
   --surface-b: #191919;
   --surface-c: #4c4c4c;
-  --surface-d: #2f2f2f;
+  --surface-d: #4b4b4b;
   --surface-e: #323232;
   --surface-f: #323232;
   --text-color: #dedede;
@@ -158,20 +158,26 @@
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: auto;
-  height: auto;
-  color: #888888;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
   border: 0 none;
   background: transparent;
-  border-radius: 3px;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: #dedede;
   border-color: transparent;
   background: transparent;
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -238,17 +244,24 @@
   padding: 0.857rem 0 0.429rem 0;
 }
 .p-datepicker .p-timepicker button {
-  width: auto;
-  height: auto;
-  color: #888888;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
+  border: 0 none;
   background: transparent;
-  border-radius: 3px;
-  transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: #dedede;
+  border-color: transparent;
   background: transparent;
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -287,10 +300,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: #dedede;
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: #4c4c4c;
 }
@@ -897,20 +906,24 @@
   margin-right: 0.5rem;
 }
 .p-multiselect-panel .p-multiselect-header .p-multiselect-close {
-  width: auto;
-  height: auto;
-  color: #888888;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
   border: 0 none;
   background: transparent;
-  border-radius: 3px;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
   color: #dedede;
   border-color: transparent;
   background: transparent;
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0;
 }
@@ -1612,20 +1625,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: transparent;
-  border: 0 none;
-  color: #888888;
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  color: #8888;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin: 0.5rem;
+  margin: 0 0.5rem;
 }
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: #4c4c4c;
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
+  color: #dedede;
   border-color: transparent;
-  color: #888888;
+  background: transparent;
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1734,23 +1753,41 @@
   border-width: 1px;
   padding: 0.571rem 0.857rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
-  color: #888888;
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
   color: #dedede;
+  border-color: transparent;
+  background: transparent;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: #81D4FA;
   color: #212529;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #212529;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #212529;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 #81D4FA;
 }
@@ -2064,20 +2101,15 @@
   padding: 0.571rem 1rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: #888888;
-  border-radius: 3px;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.1rem white;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: #dedede;
-}
 
 .p-paginator {
   background: #252525;
@@ -2244,11 +2276,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
-  color: #888888;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
   color: #dedede;
+  border-color: transparent;
+  background: transparent;
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2381,12 +2425,24 @@
   padding: 0.571rem 0.857rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
-  color: #888888;
-  margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
   color: #dedede;
+  border-color: transparent;
+  background: transparent;
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2564,7 +2620,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 0.857rem 1rem;
@@ -2598,15 +2654,15 @@
   font-weight: 700;
 }
 .p-panel .p-panel-header .p-panel-header-icon {
-  width: auto;
-  height: auto;
-  color: #888888;
-  background: transparent;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
   border: 0 none;
-  border-radius: 3px;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
   color: #dedede;
   border-color: transparent;
   background: transparent;
@@ -2714,16 +2770,16 @@
   font-size: 1rem;
 }
 .p-dialog .p-dialog-header .p-dialog-header-icon {
-  width: auto;
-  height: auto;
-  color: #888888;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
   border: 0 none;
   background: transparent;
-  border-radius: 3px;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
   color: #dedede;
   border-color: transparent;
   background: transparent;
@@ -2771,19 +2827,17 @@
 }
 .p-overlaypanel .p-overlaypanel-close {
   background: #81D4FA;
-  border: 0 none;
   color: #212529;
-  width: 1.538rem;
-  height: 1.538rem;
-  position: absolute;
-  top: -0.769rem;
-  right: -0.769rem;
-  border-radius: 50%;
+  width: 2rem;
+  height: 2rem;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
+  position: absolute;
+  top: -1rem;
+  right: -1rem;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
-  background: #29B6F6;
-  border-color: transparent;
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
+  background: #4FC3F7;
   color: #212529;
 }
 .p-overlaypanel:after {
@@ -2811,18 +2865,23 @@
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.16);
 }
 .p-sidebar .p-sidebar-close {
-  background: #81D4FA;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
   border: 0 none;
-  color: #212529;
-  width: 1.538rem;
-  height: 1.538rem;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: #29B6F6;
+.p-sidebar .p-sidebar-close:enabled:hover {
+  color: #dedede;
   border-color: transparent;
-  color: #212529;
+  background: transparent;
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3301,21 +3360,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
-    color: #888888;
-    background: transparent;
-    border: 0 none;
     width: 2rem;
     height: 2rem;
+    color: #dedede;
     border-radius: 50%;
     transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1rem;
-  }
   .p-menubar .p-menubar-button:hover {
     color: #dedede;
-    background: transparent;
-    border-color: transparent;
+    background: #4c4c4c;
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3733,6 +3786,21 @@
 .p-message .p-message-wrapper {
   padding: 1rem;
 }
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
+}
 .p-message.p-message-info {
   background: #7fbcec;
   border: 0 none;
@@ -3743,7 +3811,6 @@
   color: #212121;
 }
 .p-message.p-message-info .p-message-close {
-  background: #7fbcec;
   color: #212121;
 }
 .p-message.p-message-success {
@@ -3756,7 +3823,6 @@
   color: #212121;
 }
 .p-message.p-message-success .p-message-close {
-  background: #b7d8b7;
   color: #212121;
 }
 .p-message.p-message-warn {
@@ -3769,7 +3835,6 @@
   color: #212121;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #ffe399;
   color: #212121;
 }
 .p-message.p-message-error {
@@ -3782,23 +3847,8 @@
   color: #212121;
 }
 .p-message.p-message-error .p-message-close {
-  background: #f8b7bd;
   color: #212121;
 }
-.p-message .p-message-close {
-  border-radius: 3px;
-  width: auto;
-  height: auto;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-}
-.p-message .p-message-close:hover {
-  background: transparent;
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: 0 0 0 0.1rem white;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: normal;
@@ -3833,13 +3883,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
-  border-radius: 3px;
-  width: auto;
-  height: auto;
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: transparent;
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #7fbcec;
diff --git a/public/themes/luna-green/theme.css b/public/themes/luna-green/theme.css
index c227f12eb..a0f8c6b7f 100644
--- a/public/themes/luna-green/theme.css
+++ b/public/themes/luna-green/theme.css
@@ -3,7 +3,7 @@
   --surface-a: #191919;
   --surface-b: #191919;
   --surface-c: #4c4c4c;
-  --surface-d: #2f2f2f;
+  --surface-d: #4b4b4b;
   --surface-e: #323232;
   --surface-f: #323232;
   --text-color: #dedede;
@@ -158,20 +158,26 @@
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: auto;
-  height: auto;
-  color: #888888;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
   border: 0 none;
   background: transparent;
-  border-radius: 3px;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: #dedede;
   border-color: transparent;
   background: transparent;
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -238,17 +244,24 @@
   padding: 0.857rem 0 0.429rem 0;
 }
 .p-datepicker .p-timepicker button {
-  width: auto;
-  height: auto;
-  color: #888888;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
+  border: 0 none;
   background: transparent;
-  border-radius: 3px;
-  transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: #dedede;
+  border-color: transparent;
   background: transparent;
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -287,10 +300,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: #dedede;
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: #4c4c4c;
 }
@@ -897,20 +906,24 @@
   margin-right: 0.5rem;
 }
 .p-multiselect-panel .p-multiselect-header .p-multiselect-close {
-  width: auto;
-  height: auto;
-  color: #888888;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
   border: 0 none;
   background: transparent;
-  border-radius: 3px;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
   color: #dedede;
   border-color: transparent;
   background: transparent;
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0;
 }
@@ -1612,20 +1625,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: transparent;
-  border: 0 none;
-  color: #888888;
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  color: #8888;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin: 0.5rem;
+  margin: 0 0.5rem;
 }
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: #4c4c4c;
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
+  color: #dedede;
   border-color: transparent;
-  color: #888888;
+  background: transparent;
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1734,23 +1753,41 @@
   border-width: 1px;
   padding: 0.571rem 0.857rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
-  color: #888888;
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
   color: #dedede;
+  border-color: transparent;
+  background: transparent;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: #C5E1A5;
   color: #212529;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #212529;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #212529;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 #C5E1A5;
 }
@@ -2064,20 +2101,15 @@
   padding: 0.571rem 1rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: #888888;
-  border-radius: 3px;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.1rem white;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: #dedede;
-}
 
 .p-paginator {
   background: #252525;
@@ -2244,11 +2276,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
-  color: #888888;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
   color: #dedede;
+  border-color: transparent;
+  background: transparent;
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2381,12 +2425,24 @@
   padding: 0.571rem 0.857rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
-  color: #888888;
-  margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
   color: #dedede;
+  border-color: transparent;
+  background: transparent;
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2564,7 +2620,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 0.857rem 1rem;
@@ -2598,15 +2654,15 @@
   font-weight: 700;
 }
 .p-panel .p-panel-header .p-panel-header-icon {
-  width: auto;
-  height: auto;
-  color: #888888;
-  background: transparent;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
   border: 0 none;
-  border-radius: 3px;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
   color: #dedede;
   border-color: transparent;
   background: transparent;
@@ -2714,16 +2770,16 @@
   font-size: 1rem;
 }
 .p-dialog .p-dialog-header .p-dialog-header-icon {
-  width: auto;
-  height: auto;
-  color: #888888;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
   border: 0 none;
   background: transparent;
-  border-radius: 3px;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
   color: #dedede;
   border-color: transparent;
   background: transparent;
@@ -2771,19 +2827,17 @@
 }
 .p-overlaypanel .p-overlaypanel-close {
   background: #C5E1A5;
-  border: 0 none;
   color: #212529;
-  width: 1.538rem;
-  height: 1.538rem;
-  position: absolute;
-  top: -0.769rem;
-  right: -0.769rem;
-  border-radius: 50%;
+  width: 2rem;
+  height: 2rem;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
+  position: absolute;
+  top: -1rem;
+  right: -1rem;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
-  background: #9CCC65;
-  border-color: transparent;
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
+  background: #AED581;
   color: #212529;
 }
 .p-overlaypanel:after {
@@ -2811,18 +2865,23 @@
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.16);
 }
 .p-sidebar .p-sidebar-close {
-  background: #C5E1A5;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
   border: 0 none;
-  color: #212529;
-  width: 1.538rem;
-  height: 1.538rem;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: #9CCC65;
+.p-sidebar .p-sidebar-close:enabled:hover {
+  color: #dedede;
   border-color: transparent;
-  color: #212529;
+  background: transparent;
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3301,21 +3360,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
-    color: #888888;
-    background: transparent;
-    border: 0 none;
     width: 2rem;
     height: 2rem;
+    color: #dedede;
     border-radius: 50%;
     transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1rem;
-  }
   .p-menubar .p-menubar-button:hover {
     color: #dedede;
-    background: transparent;
-    border-color: transparent;
+    background: #4c4c4c;
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3733,6 +3786,21 @@
 .p-message .p-message-wrapper {
   padding: 1rem;
 }
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
+}
 .p-message.p-message-info {
   background: #7fbcec;
   border: 0 none;
@@ -3743,7 +3811,6 @@
   color: #212121;
 }
 .p-message.p-message-info .p-message-close {
-  background: #7fbcec;
   color: #212121;
 }
 .p-message.p-message-success {
@@ -3756,7 +3823,6 @@
   color: #212121;
 }
 .p-message.p-message-success .p-message-close {
-  background: #b7d8b7;
   color: #212121;
 }
 .p-message.p-message-warn {
@@ -3769,7 +3835,6 @@
   color: #212121;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #ffe399;
   color: #212121;
 }
 .p-message.p-message-error {
@@ -3782,23 +3847,8 @@
   color: #212121;
 }
 .p-message.p-message-error .p-message-close {
-  background: #f8b7bd;
   color: #212121;
 }
-.p-message .p-message-close {
-  border-radius: 3px;
-  width: auto;
-  height: auto;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-}
-.p-message .p-message-close:hover {
-  background: transparent;
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: 0 0 0 0.1rem white;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: normal;
@@ -3833,13 +3883,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
-  border-radius: 3px;
-  width: auto;
-  height: auto;
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: transparent;
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #7fbcec;
diff --git a/public/themes/luna-pink/theme.css b/public/themes/luna-pink/theme.css
index 6a63f9e08..aad92126c 100644
--- a/public/themes/luna-pink/theme.css
+++ b/public/themes/luna-pink/theme.css
@@ -3,7 +3,7 @@
   --surface-a: #191919;
   --surface-b: #191919;
   --surface-c: #4c4c4c;
-  --surface-d: #2f2f2f;
+  --surface-d: #4b4b4b;
   --surface-e: #323232;
   --surface-f: #323232;
   --text-color: #dedede;
@@ -158,20 +158,26 @@
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: auto;
-  height: auto;
-  color: #888888;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
   border: 0 none;
   background: transparent;
-  border-radius: 3px;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: #dedede;
   border-color: transparent;
   background: transparent;
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -238,17 +244,24 @@
   padding: 0.857rem 0 0.429rem 0;
 }
 .p-datepicker .p-timepicker button {
-  width: auto;
-  height: auto;
-  color: #888888;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
+  border: 0 none;
   background: transparent;
-  border-radius: 3px;
-  transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: #dedede;
+  border-color: transparent;
   background: transparent;
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -287,10 +300,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: #dedede;
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: #4c4c4c;
 }
@@ -897,20 +906,24 @@
   margin-right: 0.5rem;
 }
 .p-multiselect-panel .p-multiselect-header .p-multiselect-close {
-  width: auto;
-  height: auto;
-  color: #888888;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
   border: 0 none;
   background: transparent;
-  border-radius: 3px;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
   color: #dedede;
   border-color: transparent;
   background: transparent;
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0;
 }
@@ -1612,20 +1625,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: transparent;
-  border: 0 none;
-  color: #888888;
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  color: #8888;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin: 0.5rem;
+  margin: 0 0.5rem;
 }
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: #4c4c4c;
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
+  color: #dedede;
   border-color: transparent;
-  color: #888888;
+  background: transparent;
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1734,23 +1753,41 @@
   border-width: 1px;
   padding: 0.571rem 0.857rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
-  color: #888888;
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
   color: #dedede;
+  border-color: transparent;
+  background: transparent;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: #F48FB1;
   color: #212529;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #212529;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #212529;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 #F48FB1;
 }
@@ -2064,20 +2101,15 @@
   padding: 0.571rem 1rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: #888888;
-  border-radius: 3px;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.1rem white;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: #dedede;
-}
 
 .p-paginator {
   background: #252525;
@@ -2244,11 +2276,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
-  color: #888888;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
   color: #dedede;
+  border-color: transparent;
+  background: transparent;
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2381,12 +2425,24 @@
   padding: 0.571rem 0.857rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
-  color: #888888;
-  margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
   color: #dedede;
+  border-color: transparent;
+  background: transparent;
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2564,7 +2620,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 0.857rem 1rem;
@@ -2598,15 +2654,15 @@
   font-weight: 700;
 }
 .p-panel .p-panel-header .p-panel-header-icon {
-  width: auto;
-  height: auto;
-  color: #888888;
-  background: transparent;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
   border: 0 none;
-  border-radius: 3px;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
   color: #dedede;
   border-color: transparent;
   background: transparent;
@@ -2714,16 +2770,16 @@
   font-size: 1rem;
 }
 .p-dialog .p-dialog-header .p-dialog-header-icon {
-  width: auto;
-  height: auto;
-  color: #888888;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
   border: 0 none;
   background: transparent;
-  border-radius: 3px;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
   color: #dedede;
   border-color: transparent;
   background: transparent;
@@ -2771,19 +2827,17 @@
 }
 .p-overlaypanel .p-overlaypanel-close {
   background: #F48FB1;
-  border: 0 none;
   color: #212529;
-  width: 1.538rem;
-  height: 1.538rem;
-  position: absolute;
-  top: -0.769rem;
-  right: -0.769rem;
-  border-radius: 50%;
+  width: 2rem;
+  height: 2rem;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
+  position: absolute;
+  top: -1rem;
+  right: -1rem;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
-  background: #EC407A;
-  border-color: transparent;
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
+  background: #F06292;
   color: #212529;
 }
 .p-overlaypanel:after {
@@ -2811,18 +2865,23 @@
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.16);
 }
 .p-sidebar .p-sidebar-close {
-  background: #F48FB1;
+  width: 2rem;
+  height: 2rem;
+  color: #8888;
   border: 0 none;
-  color: #212529;
-  width: 1.538rem;
-  height: 1.538rem;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: #EC407A;
+.p-sidebar .p-sidebar-close:enabled:hover {
+  color: #dedede;
   border-color: transparent;
-  color: #212529;
+  background: transparent;
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3301,21 +3360,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
-    color: #888888;
-    background: transparent;
-    border: 0 none;
     width: 2rem;
     height: 2rem;
+    color: #dedede;
     border-radius: 50%;
     transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1rem;
-  }
   .p-menubar .p-menubar-button:hover {
     color: #dedede;
-    background: transparent;
-    border-color: transparent;
+    background: #4c4c4c;
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3733,6 +3786,21 @@
 .p-message .p-message-wrapper {
   padding: 1rem;
 }
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
+}
 .p-message.p-message-info {
   background: #7fbcec;
   border: 0 none;
@@ -3743,7 +3811,6 @@
   color: #212121;
 }
 .p-message.p-message-info .p-message-close {
-  background: #7fbcec;
   color: #212121;
 }
 .p-message.p-message-success {
@@ -3756,7 +3823,6 @@
   color: #212121;
 }
 .p-message.p-message-success .p-message-close {
-  background: #b7d8b7;
   color: #212121;
 }
 .p-message.p-message-warn {
@@ -3769,7 +3835,6 @@
   color: #212121;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #ffe399;
   color: #212121;
 }
 .p-message.p-message-error {
@@ -3782,23 +3847,8 @@
   color: #212121;
 }
 .p-message.p-message-error .p-message-close {
-  background: #f8b7bd;
   color: #212121;
 }
-.p-message .p-message-close {
-  border-radius: 3px;
-  width: auto;
-  height: auto;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-}
-.p-message .p-message-close:hover {
-  background: transparent;
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: 0 0 0 0.1rem white;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: normal;
@@ -3833,13 +3883,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
-  border-radius: 3px;
-  width: auto;
-  height: auto;
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: transparent;
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.1rem white;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #7fbcec;
diff --git a/public/themes/md-dark-deeppurple/theme.css b/public/themes/md-dark-deeppurple/theme.css
index 2fba674bd..83a54ec3e 100644
--- a/public/themes/md-dark-deeppurple/theme.css
+++ b/public/themes/md-dark-deeppurple/theme.css
@@ -190,12 +190,18 @@
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: rgba(255, 255, 255, 0.6);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.04);
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -265,14 +271,21 @@
   width: 3rem;
   height: 3rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
   background: transparent;
   border-radius: 50%;
-  transition: background-color 0.2s, border-color 0.2s, color 0.2s, box-shadow 0.2s, background-size 0.2s cubic-bezier(0.64, 0.09, 0.08, 1);
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: rgba(255, 255, 255, 0.6);
+  border-color: transparent;
   background: rgba(255, 255, 255, 0.04);
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -311,10 +324,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: rgba(255, 255, 255, 0.6);
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: rgba(255, 255, 255, 0.04);
 }
@@ -924,13 +933,17 @@
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
   color: rgba(255, 255, 255, 0.6);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.04);
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0;
 }
@@ -1628,20 +1641,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: transparent;
-  border: 0 none;
-  color: rgba(255, 255, 255, 0.6);
-  border-radius: 50%;
   width: 3rem;
   height: 3rem;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin: 0.5rem;
-}
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: rgba(255, 255, 255, 0.04);
-  border-color: transparent;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin: 0 0.5rem;
+}
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
+  color: rgba(255, 255, 255, 0.6);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.04);
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1750,23 +1769,41 @@
   border-width: 0 0 1px 0;
   padding: 1rem 1rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 3rem;
+  height: 3rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
-  color: rgba(255, 255, 255, 0.87);
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
+  color: rgba(255, 255, 255, 0.6);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.04);
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: rgba(206, 147, 216, 0.16);
   color: #CE93D8;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #CE93D8;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #CE93D8;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 rgba(206, 147, 216, 0.16);
 }
@@ -2080,20 +2117,15 @@
   padding: 1rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: rgba(255, 255, 255, 0.6);
-  border-radius: 4px;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: none;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: rgba(255, 255, 255, 0.87);
-}
 
 .p-paginator {
   background: #1e1e1e;
@@ -2260,11 +2292,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
+  width: 3rem;
+  height: 3rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
-  color: rgba(255, 255, 255, 0.87);
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
+  color: rgba(255, 255, 255, 0.6);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.04);
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2397,12 +2441,24 @@
   padding: 1rem 1rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
+  width: 3rem;
+  height: 3rem;
   color: rgba(255, 255, 255, 0.6);
-  margin-right: 0.5rem;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
-  color: rgba(255, 255, 255, 0.87);
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
+  color: rgba(255, 255, 255, 0.6);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.04);
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2597,7 +2653,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: none;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 1rem;
@@ -2614,7 +2670,7 @@
   box-shadow: none;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend:hover {
-  background: rgba(0, 0, 0, 0.04);
+  background: rgba(255, 255, 255, 0.04);
   border-color: rgba(255, 255, 255, 0.12);
   color: rgba(255, 255, 255, 0.87);
 }
@@ -2631,18 +2687,18 @@
   font-weight: 500;
 }
 .p-panel .p-panel-header .p-panel-header-icon {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 3rem;
+  height: 3rem;
   color: rgba(255, 255, 255, 0.6);
-  background: transparent;
   border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
   color: rgba(255, 255, 255, 0.6);
   border-color: transparent;
-  background: rgba(0, 0, 0, 0.04);
+  background: rgba(255, 255, 255, 0.04);
 }
 .p-panel .p-panel-header .p-panel-header-icon:focus {
   outline: 0 none;
@@ -2756,7 +2812,7 @@
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
   color: rgba(255, 255, 255, 0.6);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.04);
@@ -2804,19 +2860,17 @@
 }
 .p-overlaypanel .p-overlaypanel-close {
   background: #CE93D8;
-  border: 0 none;
   color: #121212;
   width: 3rem;
   height: 3rem;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
   position: absolute;
   top: -1.5rem;
   right: -1.5rem;
-  border-radius: 50%;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
   background: rgba(206, 147, 216, 0.92);
-  border-color: transparent;
   color: #121212;
 }
 .p-overlaypanel:after {
@@ -2844,18 +2898,23 @@
   box-shadow: 0 11px 15px -7px rgba(0, 0, 0, 0.2), 0 24px 38px 3px rgba(0, 0, 0, 0.14), 0 9px 46px 8px rgba(0, 0, 0, 0.12);
 }
 .p-sidebar .p-sidebar-close {
-  background: transparent;
-  border: 0 none;
-  color: rgba(255, 255, 255, 0.6);
   width: 3rem;
   height: 3rem;
+  color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: rgba(255, 255, 255, 0.04);
-  border-color: transparent;
+.p-sidebar .p-sidebar-close:enabled:hover {
   color: rgba(255, 255, 255, 0.6);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.04);
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3048,7 +3107,7 @@
   margin-left: 0.5rem;
 }
 .p-megamenu .p-megamenu-root-list > .p-menuitem > .p-menuitem-link:not(.p-disabled):hover {
-  background: rgba(0, 0, 0, 0.04);
+  background: rgba(255, 255, 255, 0.04);
 }
 .p-megamenu .p-megamenu-root-list > .p-menuitem > .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
   color: rgba(255, 255, 255, 0.87);
@@ -3066,7 +3125,7 @@
 }
 .p-megamenu .p-megamenu-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link,
 .p-megamenu .p-megamenu-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link:not(.p-disabled):hover {
-  background: rgba(0, 0, 0, 0.04);
+  background: rgba(255, 255, 255, 0.04);
 }
 .p-megamenu .p-megamenu-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link .p-menuitem-text,
 .p-megamenu .p-megamenu-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
@@ -3272,7 +3331,7 @@
   margin-left: 0.5rem;
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link:not(.p-disabled):hover {
-  background: rgba(0, 0, 0, 0.04);
+  background: rgba(255, 255, 255, 0.04);
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
   color: rgba(255, 255, 255, 0.87);
@@ -3290,7 +3349,7 @@
 }
 .p-menubar .p-menubar-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link,
 .p-menubar .p-menubar-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link:not(.p-disabled):hover {
-  background: rgba(0, 0, 0, 0.04);
+  background: rgba(255, 255, 255, 0.04);
 }
 .p-menubar .p-menubar-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link .p-menuitem-text,
 .p-menubar .p-menubar-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
@@ -3334,21 +3393,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
-    color: rgba(255, 255, 255, 0.6);
-    background: transparent;
-    border: 0 none;
     width: 3rem;
     height: 3rem;
+    color: rgba(255, 255, 255, 0.6);
     border-radius: 50%;
     transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1.5rem;
-  }
   .p-menubar .p-menubar-button:hover {
     color: rgba(255, 255, 255, 0.6);
-    background: rgba(0, 0, 0, 0.04);
-    border-color: transparent;
+    background: rgba(255, 255, 255, 0.04);
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3783,6 +3836,21 @@
 .p-message .p-message-wrapper {
   padding: 1.25rem 1.5rem;
 }
+.p-message .p-message-close {
+  width: 3rem;
+  height: 3rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-message.p-message-info {
   background: #B3E5FC;
   border: solid transparent;
@@ -3793,7 +3861,6 @@
   color: #01579B;
 }
 .p-message.p-message-info .p-message-close {
-  background: #B3E5FC;
   color: #01579B;
 }
 .p-message.p-message-success {
@@ -3806,7 +3873,6 @@
   color: #1B5E20;
 }
 .p-message.p-message-success .p-message-close {
-  background: #C8E6C9;
   color: #1B5E20;
 }
 .p-message.p-message-warn {
@@ -3819,7 +3885,6 @@
   color: #7f6003;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #FFECB3;
   color: #7f6003;
 }
 .p-message.p-message-error {
@@ -3832,23 +3897,8 @@
   color: #B71C1C;
 }
 .p-message.p-message-error .p-message-close {
-  background: #FFCDD2;
   color: #B71C1C;
 }
-.p-message .p-message-close {
-  border-radius: 50%;
-  width: 3rem;
-  height: 3rem;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-}
-.p-message .p-message-close:hover {
-  background: rgba(255, 255, 255, 0.2);
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: none;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: 500;
@@ -3883,13 +3933,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
+  width: 3rem;
+  height: 3rem;
   border-radius: 50%;
-  width: 2rem;
-  height: 2rem;
+  background: transparent;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: rgba(255, 255, 255, 0.2);
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #B3E5FC;
@@ -4286,10 +4342,10 @@
   color: rgba(255, 255, 255, 0.6);
 }
 .p-calendar-w-btn .p-datepicker-trigger.p-button:enabled:hover {
-  background: rgba(0, 0, 0, 0.04);
+  background: rgba(255, 255, 255, 0.04);
 }
 .p-calendar-w-btn .p-datepicker-trigger.p-button:enabled:active, .p-calendar-w-btn .p-datepicker-trigger.p-button:focus {
-  background: rgba(0, 0, 0, 0.12);
+  background: rgba(255, 255, 255, 0.12);
 }
 .p-calendar-w-btn:not(.p-disabled):hover {
   border-color: rgba(255, 255, 255, 0.6);
@@ -4349,7 +4405,7 @@
   font-size: 0.875rem;
 }
 .p-datepicker table td.p-datepicker-today > span {
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.38);
+  box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.38);
 }
 .p-datepicker table td.p-datepicker-today.p-highlight {
   box-shadow: 0 0 0 1px rgba(206, 147, 216, 0.16);
@@ -4468,10 +4524,10 @@
   animation: checkbox-check 125ms 50ms linear forwards;
 }
 .p-checkbox:not(.p-checkbox-disabled):hover {
-  box-shadow: 0 0 1px 10px rgba(0, 0, 0, 0.04);
+  box-shadow: 0 0 1px 10px rgba(255, 255, 255, 0.04);
 }
 .p-checkbox:not(.p-checkbox-disabled).p-checkbox-focused {
-  box-shadow: 0 0 1px 10px rgba(0, 0, 0, 0.12);
+  box-shadow: 0 0 1px 10px rgba(255, 255, 255, 0.12);
 }
 .p-checkbox.p-checkbox-checked:not(.p-checkbox-disabled):hover {
   box-shadow: 0 0 1px 10px rgba(206, 147, 216, 0.04);
@@ -4520,10 +4576,10 @@
   border-color: #CE93D8;
 }
 .p-radiobutton:not(.p-radiobutton-disabled):hover {
-  box-shadow: 0 0 1px 10px rgba(0, 0, 0, 0.04);
+  box-shadow: 0 0 1px 10px rgba(255, 255, 255, 0.04);
 }
 .p-radiobutton:not(.p-radiobutton-disabled).p-radiobutton-focused {
-  box-shadow: 0 0 1px 10px rgba(0, 0, 0, 0.12);
+  box-shadow: 0 0 1px 10px rgba(255, 255, 255, 0.12);
 }
 .p-radiobutton.p-radiobutton-checked:not(.p-radiobutton-disabled):hover {
   box-shadow: 0 0 1px 10px rgba(206, 147, 216, 0.04);
@@ -4574,20 +4630,20 @@
 }
 
 .p-inputswitch .p-inputswitch-slider:before {
-  transition-property: transform;
-  box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);
+  transition-property: box-shadow transform;
+  box-shadow: 0px 3px 1px -2px rgba(255, 255, 255, 0.2), 0px 2px 2px 0px rgba(255, 255, 255, 0.14), 0px 1px 5px 0px rgba(255, 255, 255, 0.12);
 }
 .p-inputswitch:not(.p-disabled):hover .p-inputswitch-slider:before {
-  box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12), 0 0 1px 10px rgba(0, 0, 0, 0.04);
+  box-shadow: 0px 3px 1px -2px rgba(255, 255, 255, 0.2), 0px 2px 2px 0px rgba(255, 255, 255, 0.14), 0px 1px 5px 0px rgba(255, 255, 255, 0.12), 0 0 1px 10px rgba(255, 255, 255, 0.04);
 }
 .p-inputswitch.p-inputswitch-focus .p-inputswitch-slider:before, .p-inputswitch.p-inputswitch-focus:not(.p-disabled):hover .p-inputswitch-slider:before {
-  box-shadow: 0 0 1px 10px rgba(0, 0, 0, 0.12), 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);
+  box-shadow: 0 0 1px 10px rgba(255, 255, 255, 0.12), 0px 3px 1px -2px rgba(255, 255, 255, 0.2), 0px 2px 2px 0px rgba(255, 255, 255, 0.14), 0px 1px 5px 0px rgba(255, 255, 255, 0.12);
 }
 .p-inputswitch.p-inputswitch-checked:not(.p-disabled):hover .p-inputswitch-slider:before {
-  box-shadow: 0 0 1px 10px rgba(206, 147, 216, 0.04), 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);
+  box-shadow: 0 0 1px 10px rgba(206, 147, 216, 0.04), 0px 3px 1px -2px rgba(255, 255, 255, 0.2), 0px 2px 2px 0px rgba(255, 255, 255, 0.14), 0px 1px 5px 0px rgba(255, 255, 255, 0.12);
 }
 .p-inputswitch.p-inputswitch-checked.p-inputswitch-focus .p-inputswitch-slider:before, .p-inputswitch.p-inputswitch-checked.p-inputswitch-focus:not(.p-disabled):hover .p-inputswitch-slider:before {
-  box-shadow: 0 0 1px 10px rgba(206, 147, 216, 0.12), 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);
+  box-shadow: 0 0 1px 10px rgba(206, 147, 216, 0.12), 0px 3px 1px -2px rgba(255, 255, 255, 0.2), 0px 2px 2px 0px rgba(255, 255, 255, 0.14), 0px 1px 5px 0px rgba(255, 255, 255, 0.12);
 }
 
 .p-slider .p-slider-handle {
diff --git a/public/themes/md-dark-indigo/theme.css b/public/themes/md-dark-indigo/theme.css
index 0cef0d622..9d66d0f6a 100644
--- a/public/themes/md-dark-indigo/theme.css
+++ b/public/themes/md-dark-indigo/theme.css
@@ -190,12 +190,18 @@
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: rgba(255, 255, 255, 0.6);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.04);
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -265,14 +271,21 @@
   width: 3rem;
   height: 3rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
   background: transparent;
   border-radius: 50%;
-  transition: background-color 0.2s, border-color 0.2s, color 0.2s, box-shadow 0.2s, background-size 0.2s cubic-bezier(0.64, 0.09, 0.08, 1);
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: rgba(255, 255, 255, 0.6);
+  border-color: transparent;
   background: rgba(255, 255, 255, 0.04);
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -311,10 +324,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: rgba(255, 255, 255, 0.6);
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: rgba(255, 255, 255, 0.04);
 }
@@ -924,13 +933,17 @@
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
   color: rgba(255, 255, 255, 0.6);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.04);
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0;
 }
@@ -1628,20 +1641,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: transparent;
-  border: 0 none;
-  color: rgba(255, 255, 255, 0.6);
-  border-radius: 50%;
   width: 3rem;
   height: 3rem;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin: 0.5rem;
-}
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: rgba(255, 255, 255, 0.04);
-  border-color: transparent;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin: 0 0.5rem;
+}
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
+  color: rgba(255, 255, 255, 0.6);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.04);
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1750,23 +1769,41 @@
   border-width: 0 0 1px 0;
   padding: 1rem 1rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 3rem;
+  height: 3rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
-  color: rgba(255, 255, 255, 0.87);
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
+  color: rgba(255, 255, 255, 0.6);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.04);
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: rgba(159, 168, 218, 0.16);
   color: #9FA8DA;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #9FA8DA;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #9FA8DA;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 rgba(159, 168, 218, 0.16);
 }
@@ -2080,20 +2117,15 @@
   padding: 1rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: rgba(255, 255, 255, 0.6);
-  border-radius: 4px;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: none;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: rgba(255, 255, 255, 0.87);
-}
 
 .p-paginator {
   background: #1e1e1e;
@@ -2260,11 +2292,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
+  width: 3rem;
+  height: 3rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
-  color: rgba(255, 255, 255, 0.87);
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
+  color: rgba(255, 255, 255, 0.6);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.04);
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2397,12 +2441,24 @@
   padding: 1rem 1rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
+  width: 3rem;
+  height: 3rem;
   color: rgba(255, 255, 255, 0.6);
-  margin-right: 0.5rem;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
-  color: rgba(255, 255, 255, 0.87);
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
+  color: rgba(255, 255, 255, 0.6);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.04);
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2597,7 +2653,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: none;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 1rem;
@@ -2614,7 +2670,7 @@
   box-shadow: none;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend:hover {
-  background: rgba(0, 0, 0, 0.04);
+  background: rgba(255, 255, 255, 0.04);
   border-color: rgba(255, 255, 255, 0.12);
   color: rgba(255, 255, 255, 0.87);
 }
@@ -2631,18 +2687,18 @@
   font-weight: 500;
 }
 .p-panel .p-panel-header .p-panel-header-icon {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 3rem;
+  height: 3rem;
   color: rgba(255, 255, 255, 0.6);
-  background: transparent;
   border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
   color: rgba(255, 255, 255, 0.6);
   border-color: transparent;
-  background: rgba(0, 0, 0, 0.04);
+  background: rgba(255, 255, 255, 0.04);
 }
 .p-panel .p-panel-header .p-panel-header-icon:focus {
   outline: 0 none;
@@ -2756,7 +2812,7 @@
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
   color: rgba(255, 255, 255, 0.6);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.04);
@@ -2804,19 +2860,17 @@
 }
 .p-overlaypanel .p-overlaypanel-close {
   background: #9FA8DA;
-  border: 0 none;
   color: #121212;
   width: 3rem;
   height: 3rem;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
   position: absolute;
   top: -1.5rem;
   right: -1.5rem;
-  border-radius: 50%;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
   background: rgba(159, 168, 218, 0.92);
-  border-color: transparent;
   color: #121212;
 }
 .p-overlaypanel:after {
@@ -2844,18 +2898,23 @@
   box-shadow: 0 11px 15px -7px rgba(0, 0, 0, 0.2), 0 24px 38px 3px rgba(0, 0, 0, 0.14), 0 9px 46px 8px rgba(0, 0, 0, 0.12);
 }
 .p-sidebar .p-sidebar-close {
-  background: transparent;
-  border: 0 none;
-  color: rgba(255, 255, 255, 0.6);
   width: 3rem;
   height: 3rem;
+  color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: rgba(255, 255, 255, 0.04);
-  border-color: transparent;
+.p-sidebar .p-sidebar-close:enabled:hover {
   color: rgba(255, 255, 255, 0.6);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.04);
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3048,7 +3107,7 @@
   margin-left: 0.5rem;
 }
 .p-megamenu .p-megamenu-root-list > .p-menuitem > .p-menuitem-link:not(.p-disabled):hover {
-  background: rgba(0, 0, 0, 0.04);
+  background: rgba(255, 255, 255, 0.04);
 }
 .p-megamenu .p-megamenu-root-list > .p-menuitem > .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
   color: rgba(255, 255, 255, 0.87);
@@ -3066,7 +3125,7 @@
 }
 .p-megamenu .p-megamenu-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link,
 .p-megamenu .p-megamenu-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link:not(.p-disabled):hover {
-  background: rgba(0, 0, 0, 0.04);
+  background: rgba(255, 255, 255, 0.04);
 }
 .p-megamenu .p-megamenu-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link .p-menuitem-text,
 .p-megamenu .p-megamenu-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
@@ -3272,7 +3331,7 @@
   margin-left: 0.5rem;
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link:not(.p-disabled):hover {
-  background: rgba(0, 0, 0, 0.04);
+  background: rgba(255, 255, 255, 0.04);
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
   color: rgba(255, 255, 255, 0.87);
@@ -3290,7 +3349,7 @@
 }
 .p-menubar .p-menubar-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link,
 .p-menubar .p-menubar-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link:not(.p-disabled):hover {
-  background: rgba(0, 0, 0, 0.04);
+  background: rgba(255, 255, 255, 0.04);
 }
 .p-menubar .p-menubar-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link .p-menuitem-text,
 .p-menubar .p-menubar-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
@@ -3334,21 +3393,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
-    color: rgba(255, 255, 255, 0.6);
-    background: transparent;
-    border: 0 none;
     width: 3rem;
     height: 3rem;
+    color: rgba(255, 255, 255, 0.6);
     border-radius: 50%;
     transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1.5rem;
-  }
   .p-menubar .p-menubar-button:hover {
     color: rgba(255, 255, 255, 0.6);
-    background: rgba(0, 0, 0, 0.04);
-    border-color: transparent;
+    background: rgba(255, 255, 255, 0.04);
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3783,6 +3836,21 @@
 .p-message .p-message-wrapper {
   padding: 1.25rem 1.5rem;
 }
+.p-message .p-message-close {
+  width: 3rem;
+  height: 3rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-message.p-message-info {
   background: #B3E5FC;
   border: solid transparent;
@@ -3793,7 +3861,6 @@
   color: #01579B;
 }
 .p-message.p-message-info .p-message-close {
-  background: #B3E5FC;
   color: #01579B;
 }
 .p-message.p-message-success {
@@ -3806,7 +3873,6 @@
   color: #1B5E20;
 }
 .p-message.p-message-success .p-message-close {
-  background: #C8E6C9;
   color: #1B5E20;
 }
 .p-message.p-message-warn {
@@ -3819,7 +3885,6 @@
   color: #7f6003;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #FFECB3;
   color: #7f6003;
 }
 .p-message.p-message-error {
@@ -3832,23 +3897,8 @@
   color: #B71C1C;
 }
 .p-message.p-message-error .p-message-close {
-  background: #FFCDD2;
   color: #B71C1C;
 }
-.p-message .p-message-close {
-  border-radius: 50%;
-  width: 3rem;
-  height: 3rem;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-}
-.p-message .p-message-close:hover {
-  background: rgba(255, 255, 255, 0.2);
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: none;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: 500;
@@ -3883,13 +3933,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
+  width: 3rem;
+  height: 3rem;
   border-radius: 50%;
-  width: 2rem;
-  height: 2rem;
+  background: transparent;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: rgba(255, 255, 255, 0.2);
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #B3E5FC;
@@ -4286,10 +4342,10 @@
   color: rgba(255, 255, 255, 0.6);
 }
 .p-calendar-w-btn .p-datepicker-trigger.p-button:enabled:hover {
-  background: rgba(0, 0, 0, 0.04);
+  background: rgba(255, 255, 255, 0.04);
 }
 .p-calendar-w-btn .p-datepicker-trigger.p-button:enabled:active, .p-calendar-w-btn .p-datepicker-trigger.p-button:focus {
-  background: rgba(0, 0, 0, 0.12);
+  background: rgba(255, 255, 255, 0.12);
 }
 .p-calendar-w-btn:not(.p-disabled):hover {
   border-color: rgba(255, 255, 255, 0.6);
@@ -4349,7 +4405,7 @@
   font-size: 0.875rem;
 }
 .p-datepicker table td.p-datepicker-today > span {
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.38);
+  box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.38);
 }
 .p-datepicker table td.p-datepicker-today.p-highlight {
   box-shadow: 0 0 0 1px rgba(159, 168, 218, 0.16);
@@ -4468,10 +4524,10 @@
   animation: checkbox-check 125ms 50ms linear forwards;
 }
 .p-checkbox:not(.p-checkbox-disabled):hover {
-  box-shadow: 0 0 1px 10px rgba(0, 0, 0, 0.04);
+  box-shadow: 0 0 1px 10px rgba(255, 255, 255, 0.04);
 }
 .p-checkbox:not(.p-checkbox-disabled).p-checkbox-focused {
-  box-shadow: 0 0 1px 10px rgba(0, 0, 0, 0.12);
+  box-shadow: 0 0 1px 10px rgba(255, 255, 255, 0.12);
 }
 .p-checkbox.p-checkbox-checked:not(.p-checkbox-disabled):hover {
   box-shadow: 0 0 1px 10px rgba(159, 168, 218, 0.04);
@@ -4520,10 +4576,10 @@
   border-color: #9FA8DA;
 }
 .p-radiobutton:not(.p-radiobutton-disabled):hover {
-  box-shadow: 0 0 1px 10px rgba(0, 0, 0, 0.04);
+  box-shadow: 0 0 1px 10px rgba(255, 255, 255, 0.04);
 }
 .p-radiobutton:not(.p-radiobutton-disabled).p-radiobutton-focused {
-  box-shadow: 0 0 1px 10px rgba(0, 0, 0, 0.12);
+  box-shadow: 0 0 1px 10px rgba(255, 255, 255, 0.12);
 }
 .p-radiobutton.p-radiobutton-checked:not(.p-radiobutton-disabled):hover {
   box-shadow: 0 0 1px 10px rgba(159, 168, 218, 0.04);
@@ -4574,20 +4630,20 @@
 }
 
 .p-inputswitch .p-inputswitch-slider:before {
-  transition-property: transform;
-  box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);
+  transition-property: box-shadow transform;
+  box-shadow: 0px 3px 1px -2px rgba(255, 255, 255, 0.2), 0px 2px 2px 0px rgba(255, 255, 255, 0.14), 0px 1px 5px 0px rgba(255, 255, 255, 0.12);
 }
 .p-inputswitch:not(.p-disabled):hover .p-inputswitch-slider:before {
-  box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12), 0 0 1px 10px rgba(0, 0, 0, 0.04);
+  box-shadow: 0px 3px 1px -2px rgba(255, 255, 255, 0.2), 0px 2px 2px 0px rgba(255, 255, 255, 0.14), 0px 1px 5px 0px rgba(255, 255, 255, 0.12), 0 0 1px 10px rgba(255, 255, 255, 0.04);
 }
 .p-inputswitch.p-inputswitch-focus .p-inputswitch-slider:before, .p-inputswitch.p-inputswitch-focus:not(.p-disabled):hover .p-inputswitch-slider:before {
-  box-shadow: 0 0 1px 10px rgba(0, 0, 0, 0.12), 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);
+  box-shadow: 0 0 1px 10px rgba(255, 255, 255, 0.12), 0px 3px 1px -2px rgba(255, 255, 255, 0.2), 0px 2px 2px 0px rgba(255, 255, 255, 0.14), 0px 1px 5px 0px rgba(255, 255, 255, 0.12);
 }
 .p-inputswitch.p-inputswitch-checked:not(.p-disabled):hover .p-inputswitch-slider:before {
-  box-shadow: 0 0 1px 10px rgba(159, 168, 218, 0.04), 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);
+  box-shadow: 0 0 1px 10px rgba(159, 168, 218, 0.04), 0px 3px 1px -2px rgba(255, 255, 255, 0.2), 0px 2px 2px 0px rgba(255, 255, 255, 0.14), 0px 1px 5px 0px rgba(255, 255, 255, 0.12);
 }
 .p-inputswitch.p-inputswitch-checked.p-inputswitch-focus .p-inputswitch-slider:before, .p-inputswitch.p-inputswitch-checked.p-inputswitch-focus:not(.p-disabled):hover .p-inputswitch-slider:before {
-  box-shadow: 0 0 1px 10px rgba(159, 168, 218, 0.12), 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);
+  box-shadow: 0 0 1px 10px rgba(159, 168, 218, 0.12), 0px 3px 1px -2px rgba(255, 255, 255, 0.2), 0px 2px 2px 0px rgba(255, 255, 255, 0.14), 0px 1px 5px 0px rgba(255, 255, 255, 0.12);
 }
 
 .p-slider .p-slider-handle {
diff --git a/public/themes/md-light-deeppurple/theme.css b/public/themes/md-light-deeppurple/theme.css
index d66a71dd2..cf49f4bdf 100644
--- a/public/themes/md-light-deeppurple/theme.css
+++ b/public/themes/md-light-deeppurple/theme.css
@@ -182,20 +182,26 @@
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: 3rem;
-  height: 3rem;
+  width: 2.5rem;
+  height: 2.5rem;
   color: rgba(0, 0, 0, 0.6);
   border: 0 none;
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: rgba(0, 0, 0, 0.6);
   border-color: transparent;
   background: rgba(0, 0, 0, 0.04);
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -262,17 +268,24 @@
   padding: 0.5rem;
 }
 .p-datepicker .p-timepicker button {
-  width: 3rem;
-  height: 3rem;
+  width: 2.5rem;
+  height: 2.5rem;
   color: rgba(0, 0, 0, 0.6);
+  border: 0 none;
   background: transparent;
   border-radius: 50%;
-  transition: background-color 0.2s, border-color 0.2s, color 0.2s, box-shadow 0.2s, background-size 0.2s cubic-bezier(0.64, 0.09, 0.08, 1);
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: rgba(0, 0, 0, 0.6);
+  border-color: transparent;
   background: rgba(0, 0, 0, 0.04);
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -311,10 +324,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: rgba(0, 0, 0, 0.6);
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: rgba(0, 0, 0, 0.04);
 }
@@ -917,20 +926,24 @@
   margin-right: 0.5rem;
 }
 .p-multiselect-panel .p-multiselect-header .p-multiselect-close {
-  width: 3rem;
-  height: 3rem;
+  width: 2.5rem;
+  height: 2.5rem;
   color: rgba(0, 0, 0, 0.6);
   border: 0 none;
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
   color: rgba(0, 0, 0, 0.6);
   border-color: transparent;
   background: rgba(0, 0, 0, 0.04);
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0;
 }
@@ -1628,20 +1641,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: #ffffff;
+  width: 2.5rem;
+  height: 2.5rem;
+  color: rgba(0, 0, 0, 0.6);
   border: 0 none;
-  color: rgba(0, 0, 0, 0.6);
+  background: transparent;
   border-radius: 50%;
-  width: 3rem;
-  height: 3rem;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin: 0.5rem;
+  margin: 0 0.5rem;
 }
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: rgba(0, 0, 0, 0.04);
-  border-color: transparent;
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
   color: rgba(0, 0, 0, 0.6);
+  border-color: transparent;
+  background: rgba(0, 0, 0, 0.04);
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1750,23 +1769,41 @@
   border-width: 0 0 1px 0;
   padding: 1rem 1rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2.5rem;
+  height: 2.5rem;
   color: rgba(0, 0, 0, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
-  color: #000001;
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
+  color: rgba(0, 0, 0, 0.6);
+  border-color: transparent;
+  background: rgba(0, 0, 0, 0.04);
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: rgba(103, 58, 183, 0.12);
   color: #673AB7;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #673AB7;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #673AB7;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 rgba(103, 58, 183, 0.12);
 }
@@ -2080,20 +2117,15 @@
   padding: 1rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: rgba(0, 0, 0, 0.6);
-  border-radius: 4px;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: none;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: #000001;
-}
 
 .p-paginator {
   background: #ffffff;
@@ -2260,11 +2292,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
+  width: 2.5rem;
+  height: 2.5rem;
   color: rgba(0, 0, 0, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
-  color: #000001;
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
+  color: rgba(0, 0, 0, 0.6);
+  border-color: transparent;
+  background: rgba(0, 0, 0, 0.04);
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2397,12 +2441,24 @@
   padding: 1rem 1rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
+  width: 2.5rem;
+  height: 2.5rem;
   color: rgba(0, 0, 0, 0.6);
-  margin-right: 0.5rem;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
-  color: #000001;
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
+  color: rgba(0, 0, 0, 0.6);
+  border-color: transparent;
+  background: rgba(0, 0, 0, 0.04);
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2597,7 +2653,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: none;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 1rem;
@@ -2634,12 +2690,12 @@
   width: 2.5rem;
   height: 2.5rem;
   color: rgba(0, 0, 0, 0.6);
-  background: transparent;
   border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
   color: rgba(0, 0, 0, 0.6);
   border-color: transparent;
   background: rgba(0, 0, 0, 0.04);
@@ -2747,8 +2803,8 @@
   font-size: 1.25rem;
 }
 .p-dialog .p-dialog-header .p-dialog-header-icon {
-  width: 3rem;
-  height: 3rem;
+  width: 2.5rem;
+  height: 2.5rem;
   color: rgba(0, 0, 0, 0.6);
   border: 0 none;
   background: transparent;
@@ -2756,7 +2812,7 @@
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
   color: rgba(0, 0, 0, 0.6);
   border-color: transparent;
   background: rgba(0, 0, 0, 0.04);
@@ -2804,19 +2860,17 @@
 }
 .p-overlaypanel .p-overlaypanel-close {
   background: #673AB7;
-  border: 0 none;
   color: #ffffff;
-  width: 3rem;
-  height: 3rem;
-  position: absolute;
-  top: -1.5rem;
-  right: -1.5rem;
-  border-radius: 50%;
+  width: 2.5rem;
+  height: 2.5rem;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
+  position: absolute;
+  top: -1.25rem;
+  right: -1.25rem;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
-  background: rgba(255, 255, 255, 0.92);
-  border-color: transparent;
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
+  background: rgba(103, 58, 183, 0.92);
   color: #ffffff;
 }
 .p-overlaypanel:after {
@@ -2844,18 +2898,23 @@
   box-shadow: 0 11px 15px -7px rgba(0, 0, 0, 0.2), 0 24px 38px 3px rgba(0, 0, 0, 0.14), 0 9px 46px 8px rgba(0, 0, 0, 0.12);
 }
 .p-sidebar .p-sidebar-close {
-  background: transparent;
-  border: 0 none;
+  width: 2.5rem;
+  height: 2.5rem;
   color: rgba(0, 0, 0, 0.6);
-  width: 3rem;
-  height: 3rem;
+  border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: rgba(0, 0, 0, 0.04);
-  border-color: transparent;
+.p-sidebar .p-sidebar-close:enabled:hover {
   color: rgba(0, 0, 0, 0.6);
+  border-color: transparent;
+  background: rgba(0, 0, 0, 0.04);
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3334,21 +3393,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
+    width: 2.5rem;
+    height: 2.5rem;
     color: rgba(0, 0, 0, 0.6);
-    background: transparent;
-    border: 0 none;
-    width: 3rem;
-    height: 3rem;
     border-radius: 50%;
     transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1.5rem;
-  }
   .p-menubar .p-menubar-button:hover {
     color: rgba(0, 0, 0, 0.6);
     background: rgba(0, 0, 0, 0.04);
-    border-color: transparent;
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3783,6 +3836,21 @@
 .p-message .p-message-wrapper {
   padding: 1.25rem 1.5rem;
 }
+.p-message .p-message-close {
+  width: 2.5rem;
+  height: 2.5rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-message.p-message-info {
   background: #B3E5FC;
   border: solid transparent;
@@ -3793,7 +3861,6 @@
   color: #01579B;
 }
 .p-message.p-message-info .p-message-close {
-  background: #B3E5FC;
   color: #01579B;
 }
 .p-message.p-message-success {
@@ -3806,7 +3873,6 @@
   color: #1B5E20;
 }
 .p-message.p-message-success .p-message-close {
-  background: #C8E6C9;
   color: #1B5E20;
 }
 .p-message.p-message-warn {
@@ -3819,7 +3885,6 @@
   color: #7f6003;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #FFECB3;
   color: #7f6003;
 }
 .p-message.p-message-error {
@@ -3832,23 +3897,8 @@
   color: #B71C1C;
 }
 .p-message.p-message-error .p-message-close {
-  background: #FFCDD2;
   color: #B71C1C;
 }
-.p-message .p-message-close {
-  border-radius: 50%;
-  width: 3rem;
-  height: 3rem;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-}
-.p-message .p-message-close:hover {
-  background: rgba(255, 255, 255, 0.2);
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: none;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: 500;
@@ -3883,13 +3933,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
+  width: 2.5rem;
+  height: 2.5rem;
   border-radius: 50%;
-  width: 2rem;
-  height: 2rem;
+  background: transparent;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: rgba(255, 255, 255, 0.2);
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #B3E5FC;
@@ -4574,7 +4630,7 @@
 }
 
 .p-inputswitch .p-inputswitch-slider:before {
-  transition-property: transform;
+  transition-property: box-shadow transform;
   box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);
 }
 .p-inputswitch:not(.p-disabled):hover .p-inputswitch-slider:before {
diff --git a/public/themes/md-light-indigo/theme.css b/public/themes/md-light-indigo/theme.css
index 372ddaafd..c656b3af0 100644
--- a/public/themes/md-light-indigo/theme.css
+++ b/public/themes/md-light-indigo/theme.css
@@ -182,20 +182,26 @@
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: 3rem;
-  height: 3rem;
+  width: 2.5rem;
+  height: 2.5rem;
   color: rgba(0, 0, 0, 0.6);
   border: 0 none;
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: rgba(0, 0, 0, 0.6);
   border-color: transparent;
   background: rgba(0, 0, 0, 0.04);
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -262,17 +268,24 @@
   padding: 0.5rem;
 }
 .p-datepicker .p-timepicker button {
-  width: 3rem;
-  height: 3rem;
+  width: 2.5rem;
+  height: 2.5rem;
   color: rgba(0, 0, 0, 0.6);
+  border: 0 none;
   background: transparent;
   border-radius: 50%;
-  transition: background-color 0.2s, border-color 0.2s, color 0.2s, box-shadow 0.2s, background-size 0.2s cubic-bezier(0.64, 0.09, 0.08, 1);
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: rgba(0, 0, 0, 0.6);
+  border-color: transparent;
   background: rgba(0, 0, 0, 0.04);
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -311,10 +324,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: rgba(0, 0, 0, 0.6);
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: rgba(0, 0, 0, 0.04);
 }
@@ -917,20 +926,24 @@
   margin-right: 0.5rem;
 }
 .p-multiselect-panel .p-multiselect-header .p-multiselect-close {
-  width: 3rem;
-  height: 3rem;
+  width: 2.5rem;
+  height: 2.5rem;
   color: rgba(0, 0, 0, 0.6);
   border: 0 none;
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
   color: rgba(0, 0, 0, 0.6);
   border-color: transparent;
   background: rgba(0, 0, 0, 0.04);
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0;
 }
@@ -1628,20 +1641,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: #ffffff;
+  width: 2.5rem;
+  height: 2.5rem;
+  color: rgba(0, 0, 0, 0.6);
   border: 0 none;
-  color: rgba(0, 0, 0, 0.6);
+  background: transparent;
   border-radius: 50%;
-  width: 3rem;
-  height: 3rem;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin: 0.5rem;
+  margin: 0 0.5rem;
 }
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: rgba(0, 0, 0, 0.04);
-  border-color: transparent;
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
   color: rgba(0, 0, 0, 0.6);
+  border-color: transparent;
+  background: rgba(0, 0, 0, 0.04);
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1750,23 +1769,41 @@
   border-width: 0 0 1px 0;
   padding: 1rem 1rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2.5rem;
+  height: 2.5rem;
   color: rgba(0, 0, 0, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
-  color: #000001;
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
+  color: rgba(0, 0, 0, 0.6);
+  border-color: transparent;
+  background: rgba(0, 0, 0, 0.04);
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: rgba(63, 81, 181, 0.12);
   color: #3F51B5;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #3F51B5;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #3F51B5;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 rgba(63, 81, 181, 0.12);
 }
@@ -2080,20 +2117,15 @@
   padding: 1rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: rgba(0, 0, 0, 0.6);
-  border-radius: 4px;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: none;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: #000001;
-}
 
 .p-paginator {
   background: #ffffff;
@@ -2260,11 +2292,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
+  width: 2.5rem;
+  height: 2.5rem;
   color: rgba(0, 0, 0, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
-  color: #000001;
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
+  color: rgba(0, 0, 0, 0.6);
+  border-color: transparent;
+  background: rgba(0, 0, 0, 0.04);
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2397,12 +2441,24 @@
   padding: 1rem 1rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
+  width: 2.5rem;
+  height: 2.5rem;
   color: rgba(0, 0, 0, 0.6);
-  margin-right: 0.5rem;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
-  color: #000001;
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
+  color: rgba(0, 0, 0, 0.6);
+  border-color: transparent;
+  background: rgba(0, 0, 0, 0.04);
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2597,7 +2653,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: none;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 1rem;
@@ -2634,12 +2690,12 @@
   width: 2.5rem;
   height: 2.5rem;
   color: rgba(0, 0, 0, 0.6);
-  background: transparent;
   border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
   color: rgba(0, 0, 0, 0.6);
   border-color: transparent;
   background: rgba(0, 0, 0, 0.04);
@@ -2747,8 +2803,8 @@
   font-size: 1.25rem;
 }
 .p-dialog .p-dialog-header .p-dialog-header-icon {
-  width: 3rem;
-  height: 3rem;
+  width: 2.5rem;
+  height: 2.5rem;
   color: rgba(0, 0, 0, 0.6);
   border: 0 none;
   background: transparent;
@@ -2756,7 +2812,7 @@
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
   color: rgba(0, 0, 0, 0.6);
   border-color: transparent;
   background: rgba(0, 0, 0, 0.04);
@@ -2804,19 +2860,17 @@
 }
 .p-overlaypanel .p-overlaypanel-close {
   background: #3F51B5;
-  border: 0 none;
   color: #ffffff;
-  width: 3rem;
-  height: 3rem;
-  position: absolute;
-  top: -1.5rem;
-  right: -1.5rem;
-  border-radius: 50%;
+  width: 2.5rem;
+  height: 2.5rem;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
+  position: absolute;
+  top: -1.25rem;
+  right: -1.25rem;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
-  background: rgba(255, 255, 255, 0.92);
-  border-color: transparent;
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
+  background: rgba(63, 81, 181, 0.92);
   color: #ffffff;
 }
 .p-overlaypanel:after {
@@ -2844,18 +2898,23 @@
   box-shadow: 0 11px 15px -7px rgba(0, 0, 0, 0.2), 0 24px 38px 3px rgba(0, 0, 0, 0.14), 0 9px 46px 8px rgba(0, 0, 0, 0.12);
 }
 .p-sidebar .p-sidebar-close {
-  background: transparent;
-  border: 0 none;
+  width: 2.5rem;
+  height: 2.5rem;
   color: rgba(0, 0, 0, 0.6);
-  width: 3rem;
-  height: 3rem;
+  border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: rgba(0, 0, 0, 0.04);
-  border-color: transparent;
+.p-sidebar .p-sidebar-close:enabled:hover {
   color: rgba(0, 0, 0, 0.6);
+  border-color: transparent;
+  background: rgba(0, 0, 0, 0.04);
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3334,21 +3393,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
+    width: 2.5rem;
+    height: 2.5rem;
     color: rgba(0, 0, 0, 0.6);
-    background: transparent;
-    border: 0 none;
-    width: 3rem;
-    height: 3rem;
     border-radius: 50%;
     transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1.5rem;
-  }
   .p-menubar .p-menubar-button:hover {
     color: rgba(0, 0, 0, 0.6);
     background: rgba(0, 0, 0, 0.04);
-    border-color: transparent;
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3783,6 +3836,21 @@
 .p-message .p-message-wrapper {
   padding: 1.25rem 1.5rem;
 }
+.p-message .p-message-close {
+  width: 2.5rem;
+  height: 2.5rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-message.p-message-info {
   background: #B3E5FC;
   border: solid transparent;
@@ -3793,7 +3861,6 @@
   color: #01579B;
 }
 .p-message.p-message-info .p-message-close {
-  background: #B3E5FC;
   color: #01579B;
 }
 .p-message.p-message-success {
@@ -3806,7 +3873,6 @@
   color: #1B5E20;
 }
 .p-message.p-message-success .p-message-close {
-  background: #C8E6C9;
   color: #1B5E20;
 }
 .p-message.p-message-warn {
@@ -3819,7 +3885,6 @@
   color: #7f6003;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #FFECB3;
   color: #7f6003;
 }
 .p-message.p-message-error {
@@ -3832,23 +3897,8 @@
   color: #B71C1C;
 }
 .p-message.p-message-error .p-message-close {
-  background: #FFCDD2;
   color: #B71C1C;
 }
-.p-message .p-message-close {
-  border-radius: 50%;
-  width: 3rem;
-  height: 3rem;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-}
-.p-message .p-message-close:hover {
-  background: rgba(255, 255, 255, 0.2);
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: none;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: 500;
@@ -3883,13 +3933,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
+  width: 2.5rem;
+  height: 2.5rem;
   border-radius: 50%;
-  width: 2rem;
-  height: 2rem;
+  background: transparent;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: rgba(255, 255, 255, 0.2);
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #B3E5FC;
@@ -4574,7 +4630,7 @@
 }
 
 .p-inputswitch .p-inputswitch-slider:before {
-  transition-property: transform;
+  transition-property: box-shadow transform;
   box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);
 }
 .p-inputswitch:not(.p-disabled):hover .p-inputswitch-slider:before {
diff --git a/public/themes/mdc-dark-deeppurple/theme.css b/public/themes/mdc-dark-deeppurple/theme.css
index 6fce6d107..692580ac7 100644
--- a/public/themes/mdc-dark-deeppurple/theme.css
+++ b/public/themes/mdc-dark-deeppurple/theme.css
@@ -182,20 +182,26 @@
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: 2.25rem;
-  height: 2.25rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
   border: 0 none;
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: rgba(255, 255, 255, 0.6);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.04);
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -262,17 +268,24 @@
   padding: 0.5rem;
 }
 .p-datepicker .p-timepicker button {
-  width: 2.25rem;
-  height: 2.25rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
   background: transparent;
   border-radius: 50%;
-  transition: background-color 0.2s, border-color 0.2s, color 0.2s, box-shadow 0.2s, background-size 0.2s cubic-bezier(0.64, 0.09, 0.08, 1);
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: rgba(255, 255, 255, 0.6);
+  border-color: transparent;
   background: rgba(255, 255, 255, 0.04);
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -311,10 +324,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: rgba(255, 255, 255, 0.6);
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: rgba(255, 255, 255, 0.04);
 }
@@ -917,20 +926,24 @@
   margin-right: 0.5rem;
 }
 .p-multiselect-panel .p-multiselect-header .p-multiselect-close {
-  width: 2.25rem;
-  height: 0.2 0.25rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
   border: 0 none;
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
   color: rgba(255, 255, 255, 0.6);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.04);
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0;
 }
@@ -1628,20 +1641,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: transparent;
+  width: 2rem;
+  height: 2rem;
+  color: rgba(255, 255, 255, 0.6);
   border: 0 none;
-  color: rgba(255, 255, 255, 0.6);
+  background: transparent;
   border-radius: 50%;
-  width: 2.25rem;
-  height: 2.25rem;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin: 0.5rem;
+  margin: 0 0.5rem;
 }
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: rgba(255, 255, 255, 0.04);
-  border-color: transparent;
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
   color: rgba(255, 255, 255, 0.6);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.04);
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1750,23 +1769,41 @@
   border-width: 0 0 1px 0;
   padding: 0.75rem 0.75rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
-  color: rgba(255, 255, 255, 0.87);
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
+  color: rgba(255, 255, 255, 0.6);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.04);
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: rgba(103, 58, 183, 0.16);
   color: #673AB7;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #673AB7;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #673AB7;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 rgba(103, 58, 183, 0.16);
 }
@@ -2080,20 +2117,15 @@
   padding: 0.75rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: rgba(255, 255, 255, 0.6);
-  border-radius: 4px;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: none;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: rgba(255, 255, 255, 0.87);
-}
 
 .p-paginator {
   background: #1e1e1e;
@@ -2260,11 +2292,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
-  color: rgba(255, 255, 255, 0.87);
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
+  color: rgba(255, 255, 255, 0.6);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.04);
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2397,12 +2441,24 @@
   padding: 0.75rem 0.75rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
-  margin-right: 0.5rem;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
-  color: rgba(255, 255, 255, 0.87);
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
+  color: rgba(255, 255, 255, 0.6);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.04);
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2597,7 +2653,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: none;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 0.75rem;
@@ -2614,7 +2670,7 @@
   box-shadow: none;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend:hover {
-  background: rgba(0, 0, 0, 0.04);
+  background: rgba(255, 255, 255, 0.04);
   border-color: rgba(255, 255, 255, 0.12);
   color: rgba(255, 255, 255, 0.87);
 }
@@ -2631,18 +2687,18 @@
   font-weight: 500;
 }
 .p-panel .p-panel-header .p-panel-header-icon {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
-  background: transparent;
   border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
   color: rgba(255, 255, 255, 0.6);
   border-color: transparent;
-  background: rgba(0, 0, 0, 0.04);
+  background: rgba(255, 255, 255, 0.04);
 }
 .p-panel .p-panel-header .p-panel-header-icon:focus {
   outline: 0 none;
@@ -2747,8 +2803,8 @@
   font-size: 1.25rem;
 }
 .p-dialog .p-dialog-header .p-dialog-header-icon {
-  width: 2.25rem;
-  height: 2.25rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
   border: 0 none;
   background: transparent;
@@ -2756,7 +2812,7 @@
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
   color: rgba(255, 255, 255, 0.6);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.04);
@@ -2804,19 +2860,17 @@
 }
 .p-overlaypanel .p-overlaypanel-close {
   background: #673AB7;
-  border: 0 none;
   color: #ffffff;
-  width: 2.25rem;
-  height: 2.25rem;
-  position: absolute;
-  top: -1.125rem;
-  right: -1.125rem;
-  border-radius: 50%;
+  width: 2rem;
+  height: 2rem;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
+  position: absolute;
+  top: -1rem;
+  right: -1rem;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
   background: rgba(103, 58, 183, 0.92);
-  border-color: transparent;
   color: #ffffff;
 }
 .p-overlaypanel:after {
@@ -2844,18 +2898,23 @@
   box-shadow: 0 11px 15px -7px rgba(0, 0, 0, 0.2), 0 24px 38px 3px rgba(0, 0, 0, 0.14), 0 9px 46px 8px rgba(0, 0, 0, 0.12);
 }
 .p-sidebar .p-sidebar-close {
-  background: transparent;
-  border: 0 none;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
-  width: 2.25rem;
-  height: 2.25rem;
+  border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: rgba(255, 255, 255, 0.04);
-  border-color: transparent;
+.p-sidebar .p-sidebar-close:enabled:hover {
   color: rgba(255, 255, 255, 0.6);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.04);
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3048,7 +3107,7 @@
   margin-left: 0.5rem;
 }
 .p-megamenu .p-megamenu-root-list > .p-menuitem > .p-menuitem-link:not(.p-disabled):hover {
-  background: rgba(0, 0, 0, 0.04);
+  background: rgba(255, 255, 255, 0.04);
 }
 .p-megamenu .p-megamenu-root-list > .p-menuitem > .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
   color: rgba(255, 255, 255, 0.87);
@@ -3066,7 +3125,7 @@
 }
 .p-megamenu .p-megamenu-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link,
 .p-megamenu .p-megamenu-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link:not(.p-disabled):hover {
-  background: rgba(0, 0, 0, 0.04);
+  background: rgba(255, 255, 255, 0.04);
 }
 .p-megamenu .p-megamenu-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link .p-menuitem-text,
 .p-megamenu .p-megamenu-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
@@ -3272,7 +3331,7 @@
   margin-left: 0.5rem;
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link:not(.p-disabled):hover {
-  background: rgba(0, 0, 0, 0.04);
+  background: rgba(255, 255, 255, 0.04);
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
   color: rgba(255, 255, 255, 0.87);
@@ -3290,7 +3349,7 @@
 }
 .p-menubar .p-menubar-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link,
 .p-menubar .p-menubar-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link:not(.p-disabled):hover {
-  background: rgba(0, 0, 0, 0.04);
+  background: rgba(255, 255, 255, 0.04);
 }
 .p-menubar .p-menubar-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link .p-menuitem-text,
 .p-menubar .p-menubar-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
@@ -3334,21 +3393,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
+    width: 2rem;
+    height: 2rem;
     color: rgba(255, 255, 255, 0.6);
-    background: transparent;
-    border: 0 none;
-    width: 2.25rem;
-    height: 2.25rem;
     border-radius: 50%;
     transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1.5rem;
-  }
   .p-menubar .p-menubar-button:hover {
     color: rgba(255, 255, 255, 0.6);
-    background: rgba(0, 0, 0, 0.04);
-    border-color: transparent;
+    background: rgba(255, 255, 255, 0.04);
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3783,6 +3836,21 @@
 .p-message .p-message-wrapper {
   padding: 1rem 1.25rem;
 }
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-message.p-message-info {
   background: #B3E5FC;
   border: solid transparent;
@@ -3793,7 +3861,6 @@
   color: #01579B;
 }
 .p-message.p-message-info .p-message-close {
-  background: #B3E5FC;
   color: #01579B;
 }
 .p-message.p-message-success {
@@ -3806,7 +3873,6 @@
   color: #1B5E20;
 }
 .p-message.p-message-success .p-message-close {
-  background: #C8E6C9;
   color: #1B5E20;
 }
 .p-message.p-message-warn {
@@ -3819,7 +3885,6 @@
   color: #7f6003;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #FFECB3;
   color: #7f6003;
 }
 .p-message.p-message-error {
@@ -3832,23 +3897,8 @@
   color: #B71C1C;
 }
 .p-message.p-message-error .p-message-close {
-  background: #FFCDD2;
   color: #B71C1C;
 }
-.p-message .p-message-close {
-  border-radius: 50%;
-  width: 2.25rem;
-  height: 2.25rem;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-}
-.p-message .p-message-close:hover {
-  background: rgba(255, 255, 255, 0.2);
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: none;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: 500;
@@ -3883,13 +3933,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
+  width: 2rem;
+  height: 2rem;
   border-radius: 50%;
-  width: 1.5rem;
-  height: 1.5rem;
+  background: transparent;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: rgba(255, 255, 255, 0.2);
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #B3E5FC;
@@ -4286,10 +4342,10 @@
   color: rgba(255, 255, 255, 0.6);
 }
 .p-calendar-w-btn .p-datepicker-trigger.p-button:enabled:hover {
-  background: rgba(0, 0, 0, 0.04);
+  background: rgba(255, 255, 255, 0.04);
 }
 .p-calendar-w-btn .p-datepicker-trigger.p-button:enabled:active, .p-calendar-w-btn .p-datepicker-trigger.p-button:focus {
-  background: rgba(0, 0, 0, 0.12);
+  background: rgba(255, 255, 255, 0.12);
 }
 .p-calendar-w-btn:not(.p-disabled):hover {
   border-color: rgba(255, 255, 255, 0.6);
@@ -4349,7 +4405,7 @@
   font-size: 0.875rem;
 }
 .p-datepicker table td.p-datepicker-today > span {
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.38);
+  box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.38);
 }
 .p-datepicker table td.p-datepicker-today.p-highlight {
   box-shadow: 0 0 0 1px rgba(103, 58, 183, 0.16);
@@ -4468,10 +4524,10 @@
   animation: checkbox-check 125ms 50ms linear forwards;
 }
 .p-checkbox:not(.p-checkbox-disabled):hover {
-  box-shadow: 0 0 1px 10px rgba(0, 0, 0, 0.04);
+  box-shadow: 0 0 1px 10px rgba(255, 255, 255, 0.04);
 }
 .p-checkbox:not(.p-checkbox-disabled).p-checkbox-focused {
-  box-shadow: 0 0 1px 10px rgba(0, 0, 0, 0.12);
+  box-shadow: 0 0 1px 10px rgba(255, 255, 255, 0.12);
 }
 .p-checkbox.p-checkbox-checked:not(.p-checkbox-disabled):hover {
   box-shadow: 0 0 1px 10px rgba(103, 58, 183, 0.04);
@@ -4520,10 +4576,10 @@
   border-color: #673AB7;
 }
 .p-radiobutton:not(.p-radiobutton-disabled):hover {
-  box-shadow: 0 0 1px 10px rgba(0, 0, 0, 0.04);
+  box-shadow: 0 0 1px 10px rgba(255, 255, 255, 0.04);
 }
 .p-radiobutton:not(.p-radiobutton-disabled).p-radiobutton-focused {
-  box-shadow: 0 0 1px 10px rgba(0, 0, 0, 0.12);
+  box-shadow: 0 0 1px 10px rgba(255, 255, 255, 0.12);
 }
 .p-radiobutton.p-radiobutton-checked:not(.p-radiobutton-disabled):hover {
   box-shadow: 0 0 1px 10px rgba(103, 58, 183, 0.04);
@@ -4574,20 +4630,20 @@
 }
 
 .p-inputswitch .p-inputswitch-slider:before {
-  transition-property: transform;
-  box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);
+  transition-property: box-shadow transform;
+  box-shadow: 0px 3px 1px -2px rgba(255, 255, 255, 0.2), 0px 2px 2px 0px rgba(255, 255, 255, 0.14), 0px 1px 5px 0px rgba(255, 255, 255, 0.12);
 }
 .p-inputswitch:not(.p-disabled):hover .p-inputswitch-slider:before {
-  box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12), 0 0 1px 10px rgba(0, 0, 0, 0.04);
+  box-shadow: 0px 3px 1px -2px rgba(255, 255, 255, 0.2), 0px 2px 2px 0px rgba(255, 255, 255, 0.14), 0px 1px 5px 0px rgba(255, 255, 255, 0.12), 0 0 1px 10px rgba(255, 255, 255, 0.04);
 }
 .p-inputswitch.p-inputswitch-focus .p-inputswitch-slider:before, .p-inputswitch.p-inputswitch-focus:not(.p-disabled):hover .p-inputswitch-slider:before {
-  box-shadow: 0 0 1px 10px rgba(0, 0, 0, 0.12), 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);
+  box-shadow: 0 0 1px 10px rgba(255, 255, 255, 0.12), 0px 3px 1px -2px rgba(255, 255, 255, 0.2), 0px 2px 2px 0px rgba(255, 255, 255, 0.14), 0px 1px 5px 0px rgba(255, 255, 255, 0.12);
 }
 .p-inputswitch.p-inputswitch-checked:not(.p-disabled):hover .p-inputswitch-slider:before {
-  box-shadow: 0 0 1px 10px rgba(103, 58, 183, 0.04), 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);
+  box-shadow: 0 0 1px 10px rgba(103, 58, 183, 0.04), 0px 3px 1px -2px rgba(255, 255, 255, 0.2), 0px 2px 2px 0px rgba(255, 255, 255, 0.14), 0px 1px 5px 0px rgba(255, 255, 255, 0.12);
 }
 .p-inputswitch.p-inputswitch-checked.p-inputswitch-focus .p-inputswitch-slider:before, .p-inputswitch.p-inputswitch-checked.p-inputswitch-focus:not(.p-disabled):hover .p-inputswitch-slider:before {
-  box-shadow: 0 0 1px 10px rgba(103, 58, 183, 0.12), 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);
+  box-shadow: 0 0 1px 10px rgba(103, 58, 183, 0.12), 0px 3px 1px -2px rgba(255, 255, 255, 0.2), 0px 2px 2px 0px rgba(255, 255, 255, 0.14), 0px 1px 5px 0px rgba(255, 255, 255, 0.12);
 }
 
 .p-slider .p-slider-handle {
diff --git a/public/themes/mdc-dark-indigo/theme.css b/public/themes/mdc-dark-indigo/theme.css
index 68b5f1ae6..d9cedac83 100644
--- a/public/themes/mdc-dark-indigo/theme.css
+++ b/public/themes/mdc-dark-indigo/theme.css
@@ -182,20 +182,26 @@
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: 2.25rem;
-  height: 2.25rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
   border: 0 none;
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: rgba(255, 255, 255, 0.6);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.04);
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -262,17 +268,24 @@
   padding: 0.5rem;
 }
 .p-datepicker .p-timepicker button {
-  width: 2.25rem;
-  height: 2.25rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
   background: transparent;
   border-radius: 50%;
-  transition: background-color 0.2s, border-color 0.2s, color 0.2s, box-shadow 0.2s, background-size 0.2s cubic-bezier(0.64, 0.09, 0.08, 1);
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: rgba(255, 255, 255, 0.6);
+  border-color: transparent;
   background: rgba(255, 255, 255, 0.04);
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -311,10 +324,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: rgba(255, 255, 255, 0.6);
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: rgba(255, 255, 255, 0.04);
 }
@@ -917,20 +926,24 @@
   margin-right: 0.5rem;
 }
 .p-multiselect-panel .p-multiselect-header .p-multiselect-close {
-  width: 2.25rem;
-  height: 0.2 0.25rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
   border: 0 none;
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
   color: rgba(255, 255, 255, 0.6);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.04);
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0;
 }
@@ -1628,20 +1641,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: transparent;
+  width: 2rem;
+  height: 2rem;
+  color: rgba(255, 255, 255, 0.6);
   border: 0 none;
-  color: rgba(255, 255, 255, 0.6);
+  background: transparent;
   border-radius: 50%;
-  width: 2.25rem;
-  height: 2.25rem;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin: 0.5rem;
+  margin: 0 0.5rem;
 }
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: rgba(255, 255, 255, 0.04);
-  border-color: transparent;
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
   color: rgba(255, 255, 255, 0.6);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.04);
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1750,23 +1769,41 @@
   border-width: 0 0 1px 0;
   padding: 0.75rem 0.75rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
-  color: rgba(255, 255, 255, 0.87);
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
+  color: rgba(255, 255, 255, 0.6);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.04);
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: rgba(63, 81, 181, 0.16);
   color: #3F51B5;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #3F51B5;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #3F51B5;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 rgba(63, 81, 181, 0.16);
 }
@@ -2080,20 +2117,15 @@
   padding: 0.75rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: rgba(255, 255, 255, 0.6);
-  border-radius: 4px;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: none;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: rgba(255, 255, 255, 0.87);
-}
 
 .p-paginator {
   background: #1e1e1e;
@@ -2260,11 +2292,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
-  color: rgba(255, 255, 255, 0.87);
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
+  color: rgba(255, 255, 255, 0.6);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.04);
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2397,12 +2441,24 @@
   padding: 0.75rem 0.75rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
-  margin-right: 0.5rem;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
-  color: rgba(255, 255, 255, 0.87);
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
+  color: rgba(255, 255, 255, 0.6);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.04);
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2597,7 +2653,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: none;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 0.75rem;
@@ -2614,7 +2670,7 @@
   box-shadow: none;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend:hover {
-  background: rgba(0, 0, 0, 0.04);
+  background: rgba(255, 255, 255, 0.04);
   border-color: rgba(255, 255, 255, 0.12);
   color: rgba(255, 255, 255, 0.87);
 }
@@ -2631,18 +2687,18 @@
   font-weight: 500;
 }
 .p-panel .p-panel-header .p-panel-header-icon {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
-  background: transparent;
   border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
   color: rgba(255, 255, 255, 0.6);
   border-color: transparent;
-  background: rgba(0, 0, 0, 0.04);
+  background: rgba(255, 255, 255, 0.04);
 }
 .p-panel .p-panel-header .p-panel-header-icon:focus {
   outline: 0 none;
@@ -2747,8 +2803,8 @@
   font-size: 1.25rem;
 }
 .p-dialog .p-dialog-header .p-dialog-header-icon {
-  width: 2.25rem;
-  height: 2.25rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
   border: 0 none;
   background: transparent;
@@ -2756,7 +2812,7 @@
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
   color: rgba(255, 255, 255, 0.6);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.04);
@@ -2804,19 +2860,17 @@
 }
 .p-overlaypanel .p-overlaypanel-close {
   background: #3F51B5;
-  border: 0 none;
   color: #ffffff;
-  width: 2.25rem;
-  height: 2.25rem;
-  position: absolute;
-  top: -1.125rem;
-  right: -1.125rem;
-  border-radius: 50%;
+  width: 2rem;
+  height: 2rem;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
+  position: absolute;
+  top: -1rem;
+  right: -1rem;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
   background: rgba(63, 81, 181, 0.92);
-  border-color: transparent;
   color: #ffffff;
 }
 .p-overlaypanel:after {
@@ -2844,18 +2898,23 @@
   box-shadow: 0 11px 15px -7px rgba(0, 0, 0, 0.2), 0 24px 38px 3px rgba(0, 0, 0, 0.14), 0 9px 46px 8px rgba(0, 0, 0, 0.12);
 }
 .p-sidebar .p-sidebar-close {
-  background: transparent;
-  border: 0 none;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
-  width: 2.25rem;
-  height: 2.25rem;
+  border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: rgba(255, 255, 255, 0.04);
-  border-color: transparent;
+.p-sidebar .p-sidebar-close:enabled:hover {
   color: rgba(255, 255, 255, 0.6);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.04);
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3048,7 +3107,7 @@
   margin-left: 0.5rem;
 }
 .p-megamenu .p-megamenu-root-list > .p-menuitem > .p-menuitem-link:not(.p-disabled):hover {
-  background: rgba(0, 0, 0, 0.04);
+  background: rgba(255, 255, 255, 0.04);
 }
 .p-megamenu .p-megamenu-root-list > .p-menuitem > .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
   color: rgba(255, 255, 255, 0.87);
@@ -3066,7 +3125,7 @@
 }
 .p-megamenu .p-megamenu-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link,
 .p-megamenu .p-megamenu-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link:not(.p-disabled):hover {
-  background: rgba(0, 0, 0, 0.04);
+  background: rgba(255, 255, 255, 0.04);
 }
 .p-megamenu .p-megamenu-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link .p-menuitem-text,
 .p-megamenu .p-megamenu-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
@@ -3272,7 +3331,7 @@
   margin-left: 0.5rem;
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link:not(.p-disabled):hover {
-  background: rgba(0, 0, 0, 0.04);
+  background: rgba(255, 255, 255, 0.04);
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
   color: rgba(255, 255, 255, 0.87);
@@ -3290,7 +3349,7 @@
 }
 .p-menubar .p-menubar-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link,
 .p-menubar .p-menubar-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link:not(.p-disabled):hover {
-  background: rgba(0, 0, 0, 0.04);
+  background: rgba(255, 255, 255, 0.04);
 }
 .p-menubar .p-menubar-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link .p-menuitem-text,
 .p-menubar .p-menubar-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-link:not(.p-disabled):hover .p-menuitem-text {
@@ -3334,21 +3393,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
+    width: 2rem;
+    height: 2rem;
     color: rgba(255, 255, 255, 0.6);
-    background: transparent;
-    border: 0 none;
-    width: 2.25rem;
-    height: 2.25rem;
     border-radius: 50%;
     transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1.5rem;
-  }
   .p-menubar .p-menubar-button:hover {
     color: rgba(255, 255, 255, 0.6);
-    background: rgba(0, 0, 0, 0.04);
-    border-color: transparent;
+    background: rgba(255, 255, 255, 0.04);
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3783,6 +3836,21 @@
 .p-message .p-message-wrapper {
   padding: 1rem 1.25rem;
 }
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-message.p-message-info {
   background: #B3E5FC;
   border: solid transparent;
@@ -3793,7 +3861,6 @@
   color: #01579B;
 }
 .p-message.p-message-info .p-message-close {
-  background: #B3E5FC;
   color: #01579B;
 }
 .p-message.p-message-success {
@@ -3806,7 +3873,6 @@
   color: #1B5E20;
 }
 .p-message.p-message-success .p-message-close {
-  background: #C8E6C9;
   color: #1B5E20;
 }
 .p-message.p-message-warn {
@@ -3819,7 +3885,6 @@
   color: #7f6003;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #FFECB3;
   color: #7f6003;
 }
 .p-message.p-message-error {
@@ -3832,23 +3897,8 @@
   color: #B71C1C;
 }
 .p-message.p-message-error .p-message-close {
-  background: #FFCDD2;
   color: #B71C1C;
 }
-.p-message .p-message-close {
-  border-radius: 50%;
-  width: 2.25rem;
-  height: 2.25rem;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-}
-.p-message .p-message-close:hover {
-  background: rgba(255, 255, 255, 0.2);
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: none;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: 500;
@@ -3883,13 +3933,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
+  width: 2rem;
+  height: 2rem;
   border-radius: 50%;
-  width: 1.5rem;
-  height: 1.5rem;
+  background: transparent;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: rgba(255, 255, 255, 0.2);
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #B3E5FC;
@@ -4286,10 +4342,10 @@
   color: rgba(255, 255, 255, 0.6);
 }
 .p-calendar-w-btn .p-datepicker-trigger.p-button:enabled:hover {
-  background: rgba(0, 0, 0, 0.04);
+  background: rgba(255, 255, 255, 0.04);
 }
 .p-calendar-w-btn .p-datepicker-trigger.p-button:enabled:active, .p-calendar-w-btn .p-datepicker-trigger.p-button:focus {
-  background: rgba(0, 0, 0, 0.12);
+  background: rgba(255, 255, 255, 0.12);
 }
 .p-calendar-w-btn:not(.p-disabled):hover {
   border-color: rgba(255, 255, 255, 0.6);
@@ -4349,7 +4405,7 @@
   font-size: 0.875rem;
 }
 .p-datepicker table td.p-datepicker-today > span {
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.38);
+  box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.38);
 }
 .p-datepicker table td.p-datepicker-today.p-highlight {
   box-shadow: 0 0 0 1px rgba(63, 81, 181, 0.16);
@@ -4468,10 +4524,10 @@
   animation: checkbox-check 125ms 50ms linear forwards;
 }
 .p-checkbox:not(.p-checkbox-disabled):hover {
-  box-shadow: 0 0 1px 10px rgba(0, 0, 0, 0.04);
+  box-shadow: 0 0 1px 10px rgba(255, 255, 255, 0.04);
 }
 .p-checkbox:not(.p-checkbox-disabled).p-checkbox-focused {
-  box-shadow: 0 0 1px 10px rgba(0, 0, 0, 0.12);
+  box-shadow: 0 0 1px 10px rgba(255, 255, 255, 0.12);
 }
 .p-checkbox.p-checkbox-checked:not(.p-checkbox-disabled):hover {
   box-shadow: 0 0 1px 10px rgba(63, 81, 181, 0.04);
@@ -4520,10 +4576,10 @@
   border-color: #3F51B5;
 }
 .p-radiobutton:not(.p-radiobutton-disabled):hover {
-  box-shadow: 0 0 1px 10px rgba(0, 0, 0, 0.04);
+  box-shadow: 0 0 1px 10px rgba(255, 255, 255, 0.04);
 }
 .p-radiobutton:not(.p-radiobutton-disabled).p-radiobutton-focused {
-  box-shadow: 0 0 1px 10px rgba(0, 0, 0, 0.12);
+  box-shadow: 0 0 1px 10px rgba(255, 255, 255, 0.12);
 }
 .p-radiobutton.p-radiobutton-checked:not(.p-radiobutton-disabled):hover {
   box-shadow: 0 0 1px 10px rgba(63, 81, 181, 0.04);
@@ -4574,20 +4630,20 @@
 }
 
 .p-inputswitch .p-inputswitch-slider:before {
-  transition-property: transform;
-  box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);
+  transition-property: box-shadow transform;
+  box-shadow: 0px 3px 1px -2px rgba(255, 255, 255, 0.2), 0px 2px 2px 0px rgba(255, 255, 255, 0.14), 0px 1px 5px 0px rgba(255, 255, 255, 0.12);
 }
 .p-inputswitch:not(.p-disabled):hover .p-inputswitch-slider:before {
-  box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12), 0 0 1px 10px rgba(0, 0, 0, 0.04);
+  box-shadow: 0px 3px 1px -2px rgba(255, 255, 255, 0.2), 0px 2px 2px 0px rgba(255, 255, 255, 0.14), 0px 1px 5px 0px rgba(255, 255, 255, 0.12), 0 0 1px 10px rgba(255, 255, 255, 0.04);
 }
 .p-inputswitch.p-inputswitch-focus .p-inputswitch-slider:before, .p-inputswitch.p-inputswitch-focus:not(.p-disabled):hover .p-inputswitch-slider:before {
-  box-shadow: 0 0 1px 10px rgba(0, 0, 0, 0.12), 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);
+  box-shadow: 0 0 1px 10px rgba(255, 255, 255, 0.12), 0px 3px 1px -2px rgba(255, 255, 255, 0.2), 0px 2px 2px 0px rgba(255, 255, 255, 0.14), 0px 1px 5px 0px rgba(255, 255, 255, 0.12);
 }
 .p-inputswitch.p-inputswitch-checked:not(.p-disabled):hover .p-inputswitch-slider:before {
-  box-shadow: 0 0 1px 10px rgba(63, 81, 181, 0.04), 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);
+  box-shadow: 0 0 1px 10px rgba(63, 81, 181, 0.04), 0px 3px 1px -2px rgba(255, 255, 255, 0.2), 0px 2px 2px 0px rgba(255, 255, 255, 0.14), 0px 1px 5px 0px rgba(255, 255, 255, 0.12);
 }
 .p-inputswitch.p-inputswitch-checked.p-inputswitch-focus .p-inputswitch-slider:before, .p-inputswitch.p-inputswitch-checked.p-inputswitch-focus:not(.p-disabled):hover .p-inputswitch-slider:before {
-  box-shadow: 0 0 1px 10px rgba(63, 81, 181, 0.12), 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);
+  box-shadow: 0 0 1px 10px rgba(63, 81, 181, 0.12), 0px 3px 1px -2px rgba(255, 255, 255, 0.2), 0px 2px 2px 0px rgba(255, 255, 255, 0.14), 0px 1px 5px 0px rgba(255, 255, 255, 0.12);
 }
 
 .p-slider .p-slider-handle {
diff --git a/public/themes/mdc-light-deeppurple/theme.css b/public/themes/mdc-light-deeppurple/theme.css
index bed9dd1b5..4147f212c 100644
--- a/public/themes/mdc-light-deeppurple/theme.css
+++ b/public/themes/mdc-light-deeppurple/theme.css
@@ -182,20 +182,26 @@
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: 2.25rem;
-  height: 2.25rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(0, 0, 0, 0.6);
   border: 0 none;
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: rgba(0, 0, 0, 0.6);
   border-color: transparent;
   background: rgba(0, 0, 0, 0.04);
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -262,17 +268,24 @@
   padding: 0.5rem;
 }
 .p-datepicker .p-timepicker button {
-  width: 2.25rem;
-  height: 2.25rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(0, 0, 0, 0.6);
+  border: 0 none;
   background: transparent;
   border-radius: 50%;
-  transition: background-color 0.2s, border-color 0.2s, color 0.2s, box-shadow 0.2s, background-size 0.2s cubic-bezier(0.64, 0.09, 0.08, 1);
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: rgba(0, 0, 0, 0.6);
+  border-color: transparent;
   background: rgba(0, 0, 0, 0.04);
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -311,10 +324,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: rgba(0, 0, 0, 0.6);
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: rgba(0, 0, 0, 0.04);
 }
@@ -917,20 +926,24 @@
   margin-right: 0.5rem;
 }
 .p-multiselect-panel .p-multiselect-header .p-multiselect-close {
-  width: 2.25rem;
-  height: 0.2 0.25rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(0, 0, 0, 0.6);
   border: 0 none;
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
   color: rgba(0, 0, 0, 0.6);
   border-color: transparent;
   background: rgba(0, 0, 0, 0.04);
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0;
 }
@@ -1628,20 +1641,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: #ffffff;
+  width: 2rem;
+  height: 2rem;
+  color: rgba(0, 0, 0, 0.6);
   border: 0 none;
-  color: rgba(0, 0, 0, 0.6);
+  background: transparent;
   border-radius: 50%;
-  width: 2.25rem;
-  height: 2.25rem;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin: 0.5rem;
+  margin: 0 0.5rem;
 }
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: rgba(0, 0, 0, 0.04);
-  border-color: transparent;
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
   color: rgba(0, 0, 0, 0.6);
+  border-color: transparent;
+  background: rgba(0, 0, 0, 0.04);
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1750,23 +1769,41 @@
   border-width: 0 0 1px 0;
   padding: 0.75rem 0.75rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
   color: rgba(0, 0, 0, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
-  color: #000001;
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
+  color: rgba(0, 0, 0, 0.6);
+  border-color: transparent;
+  background: rgba(0, 0, 0, 0.04);
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: rgba(103, 58, 183, 0.12);
   color: #673AB7;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #673AB7;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #673AB7;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 rgba(103, 58, 183, 0.12);
 }
@@ -2080,20 +2117,15 @@
   padding: 0.75rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: rgba(0, 0, 0, 0.6);
-  border-radius: 4px;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: none;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: #000001;
-}
 
 .p-paginator {
   background: #ffffff;
@@ -2260,11 +2292,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(0, 0, 0, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
-  color: #000001;
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
+  color: rgba(0, 0, 0, 0.6);
+  border-color: transparent;
+  background: rgba(0, 0, 0, 0.04);
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2397,12 +2441,24 @@
   padding: 0.75rem 0.75rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
+  width: 2rem;
+  height: 2rem;
   color: rgba(0, 0, 0, 0.6);
-  margin-right: 0.5rem;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
-  color: #000001;
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
+  color: rgba(0, 0, 0, 0.6);
+  border-color: transparent;
+  background: rgba(0, 0, 0, 0.04);
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2597,7 +2653,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: none;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 0.75rem;
@@ -2631,15 +2687,15 @@
   font-weight: 500;
 }
 .p-panel .p-panel-header .p-panel-header-icon {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(0, 0, 0, 0.6);
-  background: transparent;
   border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
   color: rgba(0, 0, 0, 0.6);
   border-color: transparent;
   background: rgba(0, 0, 0, 0.04);
@@ -2747,8 +2803,8 @@
   font-size: 1.25rem;
 }
 .p-dialog .p-dialog-header .p-dialog-header-icon {
-  width: 2.25rem;
-  height: 2.25rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(0, 0, 0, 0.6);
   border: 0 none;
   background: transparent;
@@ -2756,7 +2812,7 @@
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
   color: rgba(0, 0, 0, 0.6);
   border-color: transparent;
   background: rgba(0, 0, 0, 0.04);
@@ -2804,19 +2860,17 @@
 }
 .p-overlaypanel .p-overlaypanel-close {
   background: #673AB7;
-  border: 0 none;
   color: #ffffff;
-  width: 2.25rem;
-  height: 2.25rem;
-  position: absolute;
-  top: -1.125rem;
-  right: -1.125rem;
-  border-radius: 50%;
+  width: 2rem;
+  height: 2rem;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
+  position: absolute;
+  top: -1rem;
+  right: -1rem;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
-  background: rgba(255, 255, 255, 0.92);
-  border-color: transparent;
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
+  background: rgba(103, 58, 183, 0.92);
   color: #ffffff;
 }
 .p-overlaypanel:after {
@@ -2844,18 +2898,23 @@
   box-shadow: 0 11px 15px -7px rgba(0, 0, 0, 0.2), 0 24px 38px 3px rgba(0, 0, 0, 0.14), 0 9px 46px 8px rgba(0, 0, 0, 0.12);
 }
 .p-sidebar .p-sidebar-close {
-  background: transparent;
-  border: 0 none;
+  width: 2rem;
+  height: 2rem;
   color: rgba(0, 0, 0, 0.6);
-  width: 2.25rem;
-  height: 2.25rem;
+  border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: rgba(0, 0, 0, 0.04);
-  border-color: transparent;
+.p-sidebar .p-sidebar-close:enabled:hover {
   color: rgba(0, 0, 0, 0.6);
+  border-color: transparent;
+  background: rgba(0, 0, 0, 0.04);
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3334,21 +3393,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
+    width: 2rem;
+    height: 2rem;
     color: rgba(0, 0, 0, 0.6);
-    background: transparent;
-    border: 0 none;
-    width: 2.25rem;
-    height: 2.25rem;
     border-radius: 50%;
     transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1.5rem;
-  }
   .p-menubar .p-menubar-button:hover {
     color: rgba(0, 0, 0, 0.6);
     background: rgba(0, 0, 0, 0.04);
-    border-color: transparent;
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3783,6 +3836,21 @@
 .p-message .p-message-wrapper {
   padding: 1rem 1.25rem;
 }
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-message.p-message-info {
   background: #B3E5FC;
   border: solid transparent;
@@ -3793,7 +3861,6 @@
   color: #01579B;
 }
 .p-message.p-message-info .p-message-close {
-  background: #B3E5FC;
   color: #01579B;
 }
 .p-message.p-message-success {
@@ -3806,7 +3873,6 @@
   color: #1B5E20;
 }
 .p-message.p-message-success .p-message-close {
-  background: #C8E6C9;
   color: #1B5E20;
 }
 .p-message.p-message-warn {
@@ -3819,7 +3885,6 @@
   color: #7f6003;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #FFECB3;
   color: #7f6003;
 }
 .p-message.p-message-error {
@@ -3832,23 +3897,8 @@
   color: #B71C1C;
 }
 .p-message.p-message-error .p-message-close {
-  background: #FFCDD2;
   color: #B71C1C;
 }
-.p-message .p-message-close {
-  border-radius: 50%;
-  width: 2.25rem;
-  height: 2.25rem;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-}
-.p-message .p-message-close:hover {
-  background: rgba(255, 255, 255, 0.2);
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: none;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: 500;
@@ -3883,13 +3933,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
+  width: 2rem;
+  height: 2rem;
   border-radius: 50%;
-  width: 1.5rem;
-  height: 1.5rem;
+  background: transparent;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: rgba(255, 255, 255, 0.2);
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #B3E5FC;
@@ -4574,7 +4630,7 @@
 }
 
 .p-inputswitch .p-inputswitch-slider:before {
-  transition-property: transform;
+  transition-property: box-shadow transform;
   box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);
 }
 .p-inputswitch:not(.p-disabled):hover .p-inputswitch-slider:before {
diff --git a/public/themes/mdc-light-indigo/theme.css b/public/themes/mdc-light-indigo/theme.css
index 3684bcff8..f328e8764 100644
--- a/public/themes/mdc-light-indigo/theme.css
+++ b/public/themes/mdc-light-indigo/theme.css
@@ -182,20 +182,26 @@
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: 2.25rem;
-  height: 2.25rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(0, 0, 0, 0.6);
   border: 0 none;
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: rgba(0, 0, 0, 0.6);
   border-color: transparent;
   background: rgba(0, 0, 0, 0.04);
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -262,17 +268,24 @@
   padding: 0.5rem;
 }
 .p-datepicker .p-timepicker button {
-  width: 2.25rem;
-  height: 2.25rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(0, 0, 0, 0.6);
+  border: 0 none;
   background: transparent;
   border-radius: 50%;
-  transition: background-color 0.2s, border-color 0.2s, color 0.2s, box-shadow 0.2s, background-size 0.2s cubic-bezier(0.64, 0.09, 0.08, 1);
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: rgba(0, 0, 0, 0.6);
+  border-color: transparent;
   background: rgba(0, 0, 0, 0.04);
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -311,10 +324,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: rgba(0, 0, 0, 0.6);
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: rgba(0, 0, 0, 0.04);
 }
@@ -917,20 +926,24 @@
   margin-right: 0.5rem;
 }
 .p-multiselect-panel .p-multiselect-header .p-multiselect-close {
-  width: 2.25rem;
-  height: 0.2 0.25rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(0, 0, 0, 0.6);
   border: 0 none;
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
   color: rgba(0, 0, 0, 0.6);
   border-color: transparent;
   background: rgba(0, 0, 0, 0.04);
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0;
 }
@@ -1628,20 +1641,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: #ffffff;
+  width: 2rem;
+  height: 2rem;
+  color: rgba(0, 0, 0, 0.6);
   border: 0 none;
-  color: rgba(0, 0, 0, 0.6);
+  background: transparent;
   border-radius: 50%;
-  width: 2.25rem;
-  height: 2.25rem;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin: 0.5rem;
+  margin: 0 0.5rem;
 }
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: rgba(0, 0, 0, 0.04);
-  border-color: transparent;
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
   color: rgba(0, 0, 0, 0.6);
+  border-color: transparent;
+  background: rgba(0, 0, 0, 0.04);
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1750,23 +1769,41 @@
   border-width: 0 0 1px 0;
   padding: 0.75rem 0.75rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
   color: rgba(0, 0, 0, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
-  color: #000001;
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
+  color: rgba(0, 0, 0, 0.6);
+  border-color: transparent;
+  background: rgba(0, 0, 0, 0.04);
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: rgba(63, 81, 181, 0.12);
   color: #3F51B5;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #3F51B5;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #3F51B5;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 rgba(63, 81, 181, 0.12);
 }
@@ -2080,20 +2117,15 @@
   padding: 0.75rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: rgba(0, 0, 0, 0.6);
-  border-radius: 4px;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: none;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: #000001;
-}
 
 .p-paginator {
   background: #ffffff;
@@ -2260,11 +2292,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(0, 0, 0, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
-  color: #000001;
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
+  color: rgba(0, 0, 0, 0.6);
+  border-color: transparent;
+  background: rgba(0, 0, 0, 0.04);
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2397,12 +2441,24 @@
   padding: 0.75rem 0.75rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
+  width: 2rem;
+  height: 2rem;
   color: rgba(0, 0, 0, 0.6);
-  margin-right: 0.5rem;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
-  color: #000001;
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
+  color: rgba(0, 0, 0, 0.6);
+  border-color: transparent;
+  background: rgba(0, 0, 0, 0.04);
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2597,7 +2653,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: none;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 0.75rem;
@@ -2631,15 +2687,15 @@
   font-weight: 500;
 }
 .p-panel .p-panel-header .p-panel-header-icon {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(0, 0, 0, 0.6);
-  background: transparent;
   border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
   color: rgba(0, 0, 0, 0.6);
   border-color: transparent;
   background: rgba(0, 0, 0, 0.04);
@@ -2747,8 +2803,8 @@
   font-size: 1.25rem;
 }
 .p-dialog .p-dialog-header .p-dialog-header-icon {
-  width: 2.25rem;
-  height: 2.25rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(0, 0, 0, 0.6);
   border: 0 none;
   background: transparent;
@@ -2756,7 +2812,7 @@
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
   color: rgba(0, 0, 0, 0.6);
   border-color: transparent;
   background: rgba(0, 0, 0, 0.04);
@@ -2804,19 +2860,17 @@
 }
 .p-overlaypanel .p-overlaypanel-close {
   background: #3F51B5;
-  border: 0 none;
   color: #ffffff;
-  width: 2.25rem;
-  height: 2.25rem;
-  position: absolute;
-  top: -1.125rem;
-  right: -1.125rem;
-  border-radius: 50%;
+  width: 2rem;
+  height: 2rem;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
+  position: absolute;
+  top: -1rem;
+  right: -1rem;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
-  background: rgba(255, 255, 255, 0.92);
-  border-color: transparent;
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
+  background: rgba(63, 81, 181, 0.92);
   color: #ffffff;
 }
 .p-overlaypanel:after {
@@ -2844,18 +2898,23 @@
   box-shadow: 0 11px 15px -7px rgba(0, 0, 0, 0.2), 0 24px 38px 3px rgba(0, 0, 0, 0.14), 0 9px 46px 8px rgba(0, 0, 0, 0.12);
 }
 .p-sidebar .p-sidebar-close {
-  background: transparent;
-  border: 0 none;
+  width: 2rem;
+  height: 2rem;
   color: rgba(0, 0, 0, 0.6);
-  width: 2.25rem;
-  height: 2.25rem;
+  border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: rgba(0, 0, 0, 0.04);
-  border-color: transparent;
+.p-sidebar .p-sidebar-close:enabled:hover {
   color: rgba(0, 0, 0, 0.6);
+  border-color: transparent;
+  background: rgba(0, 0, 0, 0.04);
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3334,21 +3393,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
+    width: 2rem;
+    height: 2rem;
     color: rgba(0, 0, 0, 0.6);
-    background: transparent;
-    border: 0 none;
-    width: 2.25rem;
-    height: 2.25rem;
     border-radius: 50%;
     transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1.5rem;
-  }
   .p-menubar .p-menubar-button:hover {
     color: rgba(0, 0, 0, 0.6);
     background: rgba(0, 0, 0, 0.04);
-    border-color: transparent;
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3783,6 +3836,21 @@
 .p-message .p-message-wrapper {
   padding: 1rem 1.25rem;
 }
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
+}
 .p-message.p-message-info {
   background: #B3E5FC;
   border: solid transparent;
@@ -3793,7 +3861,6 @@
   color: #01579B;
 }
 .p-message.p-message-info .p-message-close {
-  background: #B3E5FC;
   color: #01579B;
 }
 .p-message.p-message-success {
@@ -3806,7 +3873,6 @@
   color: #1B5E20;
 }
 .p-message.p-message-success .p-message-close {
-  background: #C8E6C9;
   color: #1B5E20;
 }
 .p-message.p-message-warn {
@@ -3819,7 +3885,6 @@
   color: #7f6003;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #FFECB3;
   color: #7f6003;
 }
 .p-message.p-message-error {
@@ -3832,23 +3897,8 @@
   color: #B71C1C;
 }
 .p-message.p-message-error .p-message-close {
-  background: #FFCDD2;
   color: #B71C1C;
 }
-.p-message .p-message-close {
-  border-radius: 50%;
-  width: 2.25rem;
-  height: 2.25rem;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-}
-.p-message .p-message-close:hover {
-  background: rgba(255, 255, 255, 0.2);
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: none;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: 500;
@@ -3883,13 +3933,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
+  width: 2rem;
+  height: 2rem;
   border-radius: 50%;
-  width: 1.5rem;
-  height: 1.5rem;
+  background: transparent;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: rgba(255, 255, 255, 0.2);
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: none;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #B3E5FC;
@@ -4574,7 +4630,7 @@
 }
 
 .p-inputswitch .p-inputswitch-slider:before {
-  transition-property: transform;
+  transition-property: box-shadow transform;
   box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);
 }
 .p-inputswitch:not(.p-disabled):hover .p-inputswitch-slider:before {
diff --git a/public/themes/nova-accent/theme.css b/public/themes/nova-accent/theme.css
index b3114182a..f370e6d6b 100644
--- a/public/themes/nova-accent/theme.css
+++ b/public/themes/nova-accent/theme.css
@@ -86,7 +86,7 @@
 .p-autocomplete.p-autocomplete-multiple .p-autocomplete-multiple-container .p-autocomplete-token {
   padding: 0.2145rem 0.429rem;
   margin-right: 0.5rem;
-  background: #d95f00;
+  background: #e02365;
   color: #ffffff;
   border-radius: 3px;
 }
@@ -119,7 +119,7 @@
 }
 .p-autocomplete-panel .p-autocomplete-items .p-autocomplete-item.p-highlight {
   color: #ffffff;
-  background: #d95f00;
+  background: #e02365;
 }
 .p-autocomplete-panel.p-error > .p-inputtext, .p-autocomplete-panel.p-invalid > .p-inputtext {
   border-color: #a80000;
@@ -158,20 +158,26 @@
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: auto;
-  height: auto;
+  width: 2rem;
+  height: 2rem;
   color: #a6a6a6;
   border: 0 none;
   background: transparent;
-  border-radius: 3px;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: #007ad9;
   border-color: transparent;
   background: transparent;
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -210,7 +216,7 @@
 }
 .p-datepicker table td > span.p-highlight {
   color: #ffffff;
-  background: #d95f00;
+  background: #e02365;
 }
 .p-datepicker table td > span:focus {
   outline: 0 none;
@@ -224,7 +230,7 @@
 }
 .p-datepicker table td.p-datepicker-today > span.p-highlight {
   color: #ffffff;
-  background: #d95f00;
+  background: #e02365;
 }
 .p-datepicker .p-datepicker-buttonbar {
   padding: 0.857rem 0 0.429rem 0;
@@ -238,17 +244,24 @@
   padding: 0.857rem 0 0.429rem 0;
 }
 .p-datepicker .p-timepicker button {
-  width: auto;
-  height: auto;
+  width: 2rem;
+  height: 2rem;
   color: #a6a6a6;
+  border: 0 none;
   background: transparent;
-  border-radius: 3px;
-  transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: #007ad9;
+  border-color: transparent;
   background: transparent;
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -271,7 +284,7 @@
 }
 .p-datepicker .p-monthpicker .p-monthpicker-month.p-highlight {
   color: #ffffff;
-  background: #d95f00;
+  background: #e02365;
 }
 .p-datepicker.p-datepicker-multiple-month .p-datepicker-group {
   border-right: 1px solid #d8dae2;
@@ -287,10 +300,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: #007ad9;
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: #eaeaea;
 }
@@ -380,7 +389,7 @@
 .p-chips .p-chips-multiple-container .p-chips-token {
   padding: 0.2145rem 0.429rem;
   margin-right: 0.5rem;
-  background: #d95f00;
+  background: #e02365;
   color: #ffffff;
   border-radius: 3px;
 }
@@ -496,7 +505,7 @@
 }
 .p-dropdown-panel .p-dropdown-items .p-dropdown-item.p-highlight {
   color: #ffffff;
-  background: #d95f00;
+  background: #e02365;
 }
 .p-dropdown-panel .p-dropdown-items .p-dropdown-item:not(.p-highlight):not(.p-disabled):hover {
   color: #333333;
@@ -820,7 +829,7 @@
 }
 .p-listbox .p-listbox-list .p-listbox-item.p-highlight {
   color: #ffffff;
-  background: #d95f00;
+  background: #e02365;
 }
 .p-listbox .p-listbox-list .p-listbox-item:focus {
   outline: 0 none;
@@ -893,20 +902,24 @@
   margin-right: 0.5rem;
 }
 .p-multiselect-panel .p-multiselect-header .p-multiselect-close {
-  width: auto;
-  height: auto;
-  color: #848484;
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
   border: 0 none;
   background: transparent;
-  border-radius: 3px;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
-  color: #333333;
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
+  color: #007ad9;
   border-color: transparent;
   background: transparent;
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0;
 }
@@ -921,7 +934,7 @@
 }
 .p-multiselect-panel .p-multiselect-items .p-multiselect-item.p-highlight {
   color: #ffffff;
-  background: #d95f00;
+  background: #e02365;
 }
 .p-multiselect-panel .p-multiselect-items .p-multiselect-item:not(.p-highlight):not(.p-disabled):hover {
   color: #333333;
@@ -1604,20 +1617,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: #ffffff;
-  border: 0 none;
-  color: #848484;
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  color: #a6a6a6;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin: 0.5rem;
+  margin: 0 0.5rem;
 }
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: #eaeaea;
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
+  color: #007ad9;
   border-color: transparent;
-  color: #848484;
+  background: transparent;
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1637,7 +1656,7 @@
   background: #eaeaea;
 }
 .p-carousel .p-carousel-indicators .p-carousel-indicator.p-highlight button {
-  background: #d95f00;
+  background: #e02365;
   color: #ffffff;
 }
 
@@ -1696,7 +1715,7 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #d95f00;
+  color: #e02365;
   background: #ffffff;
   margin-left: 0.5rem;
 }
@@ -1708,7 +1727,7 @@
   color: #333333;
 }
 .p-datatable .p-sortable-column.p-highlight {
-  background: #d95f00;
+  background: #e02365;
   color: #ffffff;
 }
 .p-datatable .p-sortable-column.p-highlight .p-sortable-column-icon {
@@ -1726,28 +1745,46 @@
   border-width: 1px;
   padding: 0.571rem 0.857rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
-  color: #848484;
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
-  color: #333333;
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
+  color: #007ad9;
+  border-color: transparent;
+  background: transparent;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
-  background: #d95f00;
-  color: #ffffff;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #ffffff;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
+  background: #e02365;
   color: #ffffff;
 }
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
-  box-shadow: inset 0 2px 0 0 #d95f00;
+  box-shadow: inset 0 2px 0 0 #e02365;
 }
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-bottom > td {
-  box-shadow: inset 0 -2px 0 0 #d95f00;
+  box-shadow: inset 0 -2px 0 0 #e02365;
 }
 .p-datatable.p-datatable-hoverable-rows .p-datatable-tbody > tr:not(.p-highlight):hover {
   background: #eaeaea;
@@ -1788,7 +1825,7 @@
   background: #f9f9f9;
 }
 .p-datatable.p-datatable-striped .p-datatable-tbody > tr:nth-child(even).p-highlight {
-  background: #d95f00;
+  background: #e02365;
   color: #ffffff;
 }
 .p-datatable.p-datatable-striped .p-datatable-tbody > tr:nth-child(even).p-highlight .p-row-toggler {
@@ -2008,7 +2045,7 @@
 }
 .p-orderlist .p-orderlist-list .p-orderlist-item.p-highlight {
   color: #ffffff;
-  background: #d95f00;
+  background: #e02365;
 }
 
 @media screen and (max-width: 960px) {
@@ -2032,11 +2069,11 @@
   color: #333333;
 }
 .p-organizationchart .p-organizationchart-node-content.p-highlight {
-  background: #d95f00;
+  background: #e02365;
   color: #ffffff;
 }
 .p-organizationchart .p-organizationchart-node-content.p-highlight .p-node-toggler i {
-  color: #5a2700;
+  color: #731033;
 }
 .p-organizationchart .p-organizationchart-line-down {
   background: #c8c8c8;
@@ -2056,20 +2093,15 @@
   padding: 0.571rem 1rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: #848484;
-  border-radius: 3px;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #8dcdff;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: #333333;
-}
 
 .p-paginator {
   background: #f4f4f4;
@@ -2135,8 +2167,8 @@
   border-radius: 0;
 }
 .p-paginator .p-paginator-pages .p-paginator-page.p-highlight {
-  background: #d95f00;
-  border-color: #d95f00;
+  background: #e02365;
+  border-color: #e02365;
   color: #ffffff;
 }
 .p-paginator .p-paginator-pages .p-paginator-page:not(.p-highlight):hover {
@@ -2188,7 +2220,7 @@
 }
 .p-picklist .p-picklist-list .p-picklist-item.p-highlight {
   color: #ffffff;
-  background: #d95f00;
+  background: #e02365;
 }
 
 @media screen and (max-width: 960px) {
@@ -2236,11 +2268,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
-  color: #848484;
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
-  color: #333333;
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
+  color: #007ad9;
+  border-color: transparent;
+  background: transparent;
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2258,7 +2302,7 @@
   box-shadow: 0 0 0 0.2rem #8dcdff;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content.p-highlight {
-  background: #d95f00;
+  background: #e02365;
   color: #ffffff;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content.p-highlight .p-tree-toggler,
@@ -2342,7 +2386,7 @@
   height: 1.143rem;
   min-width: 1.143rem;
   line-height: 1.143rem;
-  color: #d95f00;
+  color: #e02365;
   background: #ffffff;
   margin-left: 0.5rem;
 }
@@ -2354,7 +2398,7 @@
   color: #333333;
 }
 .p-treetable .p-sortable-column.p-highlight {
-  background: #d95f00;
+  background: #e02365;
   color: #ffffff;
 }
 .p-treetable .p-sortable-column.p-highlight .p-sortable-column-icon {
@@ -2373,12 +2417,24 @@
   padding: 0.571rem 0.857rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
-  color: #848484;
-  margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
-  color: #333333;
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
+  color: #007ad9;
+  border-color: transparent;
+  background: transparent;
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2387,7 +2443,7 @@
   color: #333333;
 }
 .p-treetable .p-treetable-tbody > tr.p-highlight {
-  background: #d95f00;
+  background: #e02365;
   color: #ffffff;
 }
 .p-treetable .p-treetable-tbody > tr.p-highlight .p-treetable-toggler {
@@ -2556,7 +2612,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: background-color 0.2s, box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 0.857rem 1rem;
@@ -2590,16 +2646,16 @@
   font-weight: 700;
 }
 .p-panel .p-panel-header .p-panel-header-icon {
-  width: auto;
-  height: auto;
-  color: #ffffff;
-  background: transparent;
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
   border: 0 none;
-  border-radius: 3px;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
-  color: #5ab7ff;
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
+  color: #007ad9;
   border-color: transparent;
   background: transparent;
 }
@@ -2706,17 +2762,17 @@
   font-size: 1rem;
 }
 .p-dialog .p-dialog-header .p-dialog-header-icon {
-  width: auto;
-  height: auto;
-  color: #ffffff;
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
   border: 0 none;
   background: transparent;
-  border-radius: 3px;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
-  color: #5ab7ff;
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
+  color: #007ad9;
   border-color: transparent;
   background: transparent;
 }
@@ -2763,19 +2819,17 @@
 }
 .p-overlaypanel .p-overlaypanel-close {
   background: #007ad9;
-  border: 0 none;
   color: #ffffff;
-  width: 1.538rem;
-  height: 1.538rem;
-  position: absolute;
-  top: -0.769rem;
-  right: -0.769rem;
-  border-radius: 50%;
+  width: 2rem;
+  height: 2rem;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
+  position: absolute;
+  top: -1rem;
+  right: -1rem;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
-  background: #005b9f;
-  border-color: transparent;
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
+  background: #116fbf;
   color: #ffffff;
 }
 .p-overlaypanel:after {
@@ -2803,18 +2857,23 @@
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.16);
 }
 .p-sidebar .p-sidebar-close {
-  background: #007ad9;
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
   border: 0 none;
-  color: #ffffff;
-  width: 1.538rem;
-  height: 1.538rem;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: #005b9f;
+.p-sidebar .p-sidebar-close:enabled:hover {
+  color: #007ad9;
   border-color: transparent;
-  color: #ffffff;
+  background: transparent;
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3293,21 +3352,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
-    color: #ffffff;
-    background: transparent;
-    border: 0 none;
     width: 2rem;
     height: 2rem;
+    color: #333333;
     border-radius: 50%;
     transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1rem;
-  }
   .p-menubar .p-menubar-button:hover {
-    color: #5ab7ff;
-    background: transparent;
-    border-color: transparent;
+    color: #333333;
+    background: #eaeaea;
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3538,7 +3591,7 @@
   box-shadow: 0 0 0 0.2rem #8dcdff;
 }
 .p-steps .p-steps-item.p-highlight .p-steps-number {
-  background: #d95f00;
+  background: #e02365;
   color: #ffffff;
 }
 .p-steps .p-steps-item.p-highlight .p-steps-title {
@@ -3725,6 +3778,21 @@
 .p-message .p-message-wrapper {
   padding: 1rem;
 }
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
+}
 .p-message.p-message-info {
   background: #7fbcec;
   border: 0 none;
@@ -3735,7 +3803,6 @@
   color: #212121;
 }
 .p-message.p-message-info .p-message-close {
-  background: #7fbcec;
   color: #212121;
 }
 .p-message.p-message-success {
@@ -3748,7 +3815,6 @@
   color: #212121;
 }
 .p-message.p-message-success .p-message-close {
-  background: #b7d8b7;
   color: #212121;
 }
 .p-message.p-message-warn {
@@ -3761,7 +3827,6 @@
   color: #212121;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #ffe399;
   color: #212121;
 }
 .p-message.p-message-error {
@@ -3774,23 +3839,8 @@
   color: #212121;
 }
 .p-message.p-message-error .p-message-close {
-  background: #f8b7bd;
   color: #212121;
 }
-.p-message .p-message-close {
-  border-radius: 3px;
-  width: auto;
-  height: auto;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-}
-.p-message .p-message-close:hover {
-  background: transparent;
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: 0 0 0 0.2rem #8dcdff;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: normal;
@@ -3825,13 +3875,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
-  border-radius: 3px;
-  width: auto;
-  height: auto;
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: transparent;
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #7fbcec;
@@ -3926,7 +3982,7 @@
   background: #eaeaea;
 }
 .p-galleria .p-galleria-indicators .p-galleria-indicator.p-highlight button {
-  background: #d95f00;
+  background: #e02365;
   color: #ffffff;
 }
 .p-galleria.p-galleria-indicators-bottom .p-galleria-indicator, .p-galleria.p-galleria-indicators-top .p-galleria-indicator {
@@ -3945,7 +4001,7 @@
   background: rgba(255, 255, 255, 0.6);
 }
 .p-galleria.p-galleria-indicator-onitem .p-galleria-indicators .p-galleria-indicator.p-highlight button {
-  background: #d95f00;
+  background: #e02365;
   color: #ffffff;
 }
 .p-galleria .p-galleria-thumbnail-container {
@@ -4093,4 +4149,40 @@
   color: #ffffff;
 }
 
+.p-panel .p-panel-header .p-panel-header-icon {
+  color: #ffffff;
+}
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
+  color: #5ab7ff;
+}
+
+.p-dialog .p-dialog-header .p-dialog-header-icon {
+  color: #ffffff;
+}
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
+  color: #5ab7ff;
+}
+
+.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
+  background-color: #27a0ff;
+  border-color: #27a0ff;
+  color: #ffffff;
+}
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight .p-accordion-header-link {
+  background: #e02365;
+  border-color: #e02365;
+  color: #ffffff;
+}
+.p-accordion .p-accordion-header:not(.p-disabled).p-highlight:hover .p-accordion-header-link {
+  background: #e96694;
+  border-color: #e96694;
+  color: #ffffff;
+}
+
+.p-fieldset.p-fieldset-toggleable .p-fieldset-legend:hover {
+  background-color: #27a0ff;
+  border-color: #27a0ff;
+  color: #ffffff;
+}
+
 /* Customizations to the designer theme should be defined here */
diff --git a/public/themes/nova-alt/theme.css b/public/themes/nova-alt/theme.css
index 25a9a2fd4..2169066e5 100644
--- a/public/themes/nova-alt/theme.css
+++ b/public/themes/nova-alt/theme.css
@@ -158,20 +158,26 @@
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: auto;
-  height: auto;
+  width: 2rem;
+  height: 2rem;
   color: #a6a6a6;
   border: 0 none;
   background: transparent;
-  border-radius: 3px;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: #007ad9;
   border-color: transparent;
   background: transparent;
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -238,17 +244,24 @@
   padding: 0.857rem 0 0.429rem 0;
 }
 .p-datepicker .p-timepicker button {
-  width: auto;
-  height: auto;
+  width: 2rem;
+  height: 2rem;
   color: #a6a6a6;
+  border: 0 none;
   background: transparent;
-  border-radius: 3px;
-  transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: #007ad9;
+  border-color: transparent;
   background: transparent;
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -287,10 +300,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: #007ad9;
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: #eaeaea;
 }
@@ -897,20 +906,24 @@
   margin-right: 0.5rem;
 }
 .p-multiselect-panel .p-multiselect-header .p-multiselect-close {
-  width: auto;
-  height: auto;
-  color: #848484;
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
   border: 0 none;
   background: transparent;
-  border-radius: 3px;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
-  color: #333333;
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
+  color: #007ad9;
   border-color: transparent;
   background: transparent;
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0;
 }
@@ -1612,20 +1625,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: #ffffff;
-  border: 0 none;
-  color: #848484;
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  color: #a6a6a6;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin: 0.5rem;
+  margin: 0 0.5rem;
 }
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: #eaeaea;
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
+  color: #007ad9;
   border-color: transparent;
-  color: #848484;
+  background: transparent;
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1734,23 +1753,41 @@
   border-width: 1px;
   padding: 0.571rem 0.857rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
-  color: #848484;
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
-  color: #333333;
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
+  color: #007ad9;
+  border-color: transparent;
+  background: transparent;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: #007ad9;
   color: #ffffff;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #ffffff;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #ffffff;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 #007ad9;
 }
@@ -2064,20 +2101,15 @@
   padding: 0.571rem 1rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: #848484;
-  border-radius: 3px;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #8dcdff;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: #333333;
-}
 
 .p-paginator {
   background: #f4f4f4;
@@ -2244,11 +2276,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
-  color: #848484;
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
-  color: #333333;
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
+  color: #007ad9;
+  border-color: transparent;
+  background: transparent;
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2381,12 +2425,24 @@
   padding: 0.571rem 0.857rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
-  color: #848484;
-  margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
-  color: #333333;
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
+  color: #007ad9;
+  border-color: transparent;
+  background: transparent;
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2564,7 +2620,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: background-color 0.2s, box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 0.857rem 1rem;
@@ -2598,16 +2654,16 @@
   font-weight: 700;
 }
 .p-panel .p-panel-header .p-panel-header-icon {
-  width: auto;
-  height: auto;
-  color: #ffffff;
-  background: transparent;
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
   border: 0 none;
-  border-radius: 3px;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
-  color: #b4b4b4;
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
+  color: #007ad9;
   border-color: transparent;
   background: transparent;
 }
@@ -2714,17 +2770,17 @@
   font-size: 1rem;
 }
 .p-dialog .p-dialog-header .p-dialog-header-icon {
-  width: auto;
-  height: auto;
-  color: #ffffff;
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
   border: 0 none;
   background: transparent;
-  border-radius: 3px;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
-  color: #b4b4b4;
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
+  color: #007ad9;
   border-color: transparent;
   background: transparent;
 }
@@ -2771,19 +2827,17 @@
 }
 .p-overlaypanel .p-overlaypanel-close {
   background: #007ad9;
-  border: 0 none;
   color: #ffffff;
-  width: 1.538rem;
-  height: 1.538rem;
-  position: absolute;
-  top: -0.769rem;
-  right: -0.769rem;
-  border-radius: 50%;
+  width: 2rem;
+  height: 2rem;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
+  position: absolute;
+  top: -1rem;
+  right: -1rem;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
-  background: #005b9f;
-  border-color: transparent;
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
+  background: #116fbf;
   color: #ffffff;
 }
 .p-overlaypanel:after {
@@ -2811,18 +2865,23 @@
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.16);
 }
 .p-sidebar .p-sidebar-close {
-  background: #007ad9;
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
   border: 0 none;
-  color: #ffffff;
-  width: 1.538rem;
-  height: 1.538rem;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: #005b9f;
+.p-sidebar .p-sidebar-close:enabled:hover {
+  color: #007ad9;
   border-color: transparent;
-  color: #ffffff;
+  background: transparent;
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3301,21 +3360,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
-    color: #ffffff;
-    background: transparent;
-    border: 0 none;
     width: 2rem;
     height: 2rem;
+    color: #333333;
     border-radius: 50%;
     transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1rem;
-  }
   .p-menubar .p-menubar-button:hover {
-    color: #b4b4b4;
-    background: transparent;
-    border-color: transparent;
+    color: #333333;
+    background: #eaeaea;
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3733,6 +3786,21 @@
 .p-message .p-message-wrapper {
   padding: 1rem;
 }
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
+}
 .p-message.p-message-info {
   background: #7fbcec;
   border: 0 none;
@@ -3743,7 +3811,6 @@
   color: #212121;
 }
 .p-message.p-message-info .p-message-close {
-  background: #7fbcec;
   color: #212121;
 }
 .p-message.p-message-success {
@@ -3756,7 +3823,6 @@
   color: #212121;
 }
 .p-message.p-message-success .p-message-close {
-  background: #b7d8b7;
   color: #212121;
 }
 .p-message.p-message-warn {
@@ -3769,7 +3835,6 @@
   color: #212121;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #ffe399;
   color: #212121;
 }
 .p-message.p-message-error {
@@ -3782,23 +3847,8 @@
   color: #212121;
 }
 .p-message.p-message-error .p-message-close {
-  background: #f8b7bd;
   color: #212121;
 }
-.p-message .p-message-close {
-  border-radius: 3px;
-  width: auto;
-  height: auto;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-}
-.p-message .p-message-close:hover {
-  background: transparent;
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: 0 0 0 0.2rem #8dcdff;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: normal;
@@ -3833,13 +3883,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
-  border-radius: 3px;
-  width: auto;
-  height: auto;
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: transparent;
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #7fbcec;
@@ -4101,4 +4157,30 @@
   color: #ffffff;
 }
 
+.p-panel .p-panel-header .p-panel-header-icon {
+  color: #ffffff;
+}
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
+  color: #b4b4b4;
+}
+
+.p-dialog .p-dialog-header .p-dialog-header-icon {
+  color: #ffffff;
+}
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
+  color: #b4b4b4;
+}
+
+.p-accordion .p-accordion-header:not(.p-highlight):not(.p-disabled):hover .p-accordion-header-link {
+  background-color: #494949;
+  border: 1px solid #494949;
+  color: #ffffff;
+}
+
+.p-fieldset.p-fieldset-toggleable .p-fieldset-legend:hover {
+  background-color: #494949;
+  border-color: #494949;
+  color: #ffffff;
+}
+
 /* Customizations to the designer theme should be defined here */
diff --git a/public/themes/nova-vue/theme.css b/public/themes/nova-vue/theme.css
index 858521eb9..bdebdeb00 100644
--- a/public/themes/nova-vue/theme.css
+++ b/public/themes/nova-vue/theme.css
@@ -158,20 +158,26 @@
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: auto;
-  height: auto;
+  width: 2rem;
+  height: 2rem;
   color: #a6a6a6;
   border: 0 none;
   background: transparent;
-  border-radius: 3px;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: #41b883;
   border-color: transparent;
   background: transparent;
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #c2e9d8;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -238,17 +244,24 @@
   padding: 0.857rem 0 0.429rem 0;
 }
 .p-datepicker .p-timepicker button {
-  width: auto;
-  height: auto;
+  width: 2rem;
+  height: 2rem;
   color: #a6a6a6;
+  border: 0 none;
   background: transparent;
-  border-radius: 3px;
-  transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: #41b883;
+  border-color: transparent;
   background: transparent;
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #c2e9d8;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -287,10 +300,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: #41b883;
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: #eaeaea;
 }
@@ -897,20 +906,24 @@
   margin-right: 0.5rem;
 }
 .p-multiselect-panel .p-multiselect-header .p-multiselect-close {
-  width: auto;
-  height: auto;
-  color: #848484;
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
   border: 0 none;
   background: transparent;
-  border-radius: 3px;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
-  color: #333333;
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
+  color: #41b883;
   border-color: transparent;
   background: transparent;
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #c2e9d8;
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0;
 }
@@ -1612,20 +1625,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: #ffffff;
-  border: 0 none;
-  color: #848484;
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  color: #a6a6a6;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin: 0.5rem;
+  margin: 0 0.5rem;
 }
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: #eaeaea;
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
+  color: #41b883;
   border-color: transparent;
-  color: #848484;
+  background: transparent;
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #c2e9d8;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1734,23 +1753,41 @@
   border-width: 1px;
   padding: 0.571rem 0.857rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
-  color: #848484;
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
-  color: #333333;
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
+  color: #41b883;
+  border-color: transparent;
+  background: transparent;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #c2e9d8;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: #41b883;
   color: #ffffff;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #ffffff;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #ffffff;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 #41b883;
 }
@@ -2064,20 +2101,15 @@
   padding: 0.571rem 1rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: #848484;
-  border-radius: 3px;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #c2e9d8;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: #333333;
-}
 
 .p-paginator {
   background: #f4f4f4;
@@ -2244,11 +2276,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
-  color: #848484;
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
-  color: #333333;
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
+  color: #41b883;
+  border-color: transparent;
+  background: transparent;
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #c2e9d8;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2381,12 +2425,24 @@
   padding: 0.571rem 0.857rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
-  color: #848484;
-  margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
-  color: #333333;
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
+  color: #41b883;
+  border-color: transparent;
+  background: transparent;
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #c2e9d8;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2564,7 +2620,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: background-color 0.2s, box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 0.857rem 1rem;
@@ -2598,16 +2654,16 @@
   font-weight: 700;
 }
 .p-panel .p-panel-header .p-panel-header-icon {
-  width: auto;
-  height: auto;
-  color: #848484;
-  background: transparent;
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
   border: 0 none;
-  border-radius: 3px;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
-  color: #333333;
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
+  color: #41b883;
   border-color: transparent;
   background: transparent;
 }
@@ -2714,17 +2770,17 @@
   font-size: 1rem;
 }
 .p-dialog .p-dialog-header .p-dialog-header-icon {
-  width: auto;
-  height: auto;
-  color: #848484;
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
   border: 0 none;
   background: transparent;
-  border-radius: 3px;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
-  color: #333333;
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
+  color: #41b883;
   border-color: transparent;
   background: transparent;
 }
@@ -2771,19 +2827,17 @@
 }
 .p-overlaypanel .p-overlaypanel-close {
   background: #41b883;
-  border: 0 none;
   color: #ffffff;
-  width: 1.538rem;
-  height: 1.538rem;
-  position: absolute;
-  top: -0.769rem;
-  right: -0.769rem;
-  border-radius: 50%;
+  width: 2rem;
+  height: 2rem;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
+  position: absolute;
+  top: -1rem;
+  right: -1rem;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
-  background: #246749;
-  border-color: transparent;
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
+  background: #318c63;
   color: #ffffff;
 }
 .p-overlaypanel:after {
@@ -2811,18 +2865,23 @@
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.16);
 }
 .p-sidebar .p-sidebar-close {
-  background: #41b883;
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
   border: 0 none;
-  color: #ffffff;
-  width: 1.538rem;
-  height: 1.538rem;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: #246749;
+.p-sidebar .p-sidebar-close:enabled:hover {
+  color: #41b883;
   border-color: transparent;
-  color: #ffffff;
+  background: transparent;
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #c2e9d8;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3301,21 +3360,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
-    color: #848484;
-    background: transparent;
-    border: 0 none;
     width: 2rem;
     height: 2rem;
+    color: #333333;
     border-radius: 50%;
     transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1rem;
-  }
   .p-menubar .p-menubar-button:hover {
     color: #333333;
-    background: transparent;
-    border-color: transparent;
+    background: #eaeaea;
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3733,6 +3786,21 @@
 .p-message .p-message-wrapper {
   padding: 1rem;
 }
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #c2e9d8;
+}
 .p-message.p-message-info {
   background: #7fbcec;
   border: 0 none;
@@ -3743,7 +3811,6 @@
   color: #212121;
 }
 .p-message.p-message-info .p-message-close {
-  background: #7fbcec;
   color: #212121;
 }
 .p-message.p-message-success {
@@ -3756,7 +3823,6 @@
   color: #212121;
 }
 .p-message.p-message-success .p-message-close {
-  background: #b7d8b7;
   color: #212121;
 }
 .p-message.p-message-warn {
@@ -3769,7 +3835,6 @@
   color: #212121;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #ffe399;
   color: #212121;
 }
 .p-message.p-message-error {
@@ -3782,23 +3847,8 @@
   color: #212121;
 }
 .p-message.p-message-error .p-message-close {
-  background: #f8b7bd;
   color: #212121;
 }
-.p-message .p-message-close {
-  border-radius: 3px;
-  width: auto;
-  height: auto;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-}
-.p-message .p-message-close:hover {
-  background: transparent;
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: 0 0 0 0.2rem #c2e9d8;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: normal;
@@ -3833,13 +3883,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
-  border-radius: 3px;
-  width: auto;
-  height: auto;
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: transparent;
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #c2e9d8;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #7fbcec;
@@ -4101,4 +4157,18 @@
   color: #ffffff;
 }
 
+.p-panel .p-panel-header .p-panel-header-icon {
+  color: #848484;
+}
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
+  color: #333333;
+}
+
+.p-dialog .p-dialog-header .p-dialog-header-icon {
+  color: #848484;
+}
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
+  color: #333333;
+}
+
 /* Customizations to the designer theme should be defined here */
diff --git a/public/themes/nova/theme.css b/public/themes/nova/theme.css
index f2e686873..574f95a17 100644
--- a/public/themes/nova/theme.css
+++ b/public/themes/nova/theme.css
@@ -158,20 +158,26 @@
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: auto;
-  height: auto;
+  width: 2rem;
+  height: 2rem;
   color: #a6a6a6;
   border: 0 none;
   background: transparent;
-  border-radius: 3px;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: #007ad9;
   border-color: transparent;
   background: transparent;
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -238,17 +244,24 @@
   padding: 0.857rem 0 0.429rem 0;
 }
 .p-datepicker .p-timepicker button {
-  width: auto;
-  height: auto;
+  width: 2rem;
+  height: 2rem;
   color: #a6a6a6;
+  border: 0 none;
   background: transparent;
-  border-radius: 3px;
-  transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: #007ad9;
+  border-color: transparent;
   background: transparent;
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -287,10 +300,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: #007ad9;
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: #eaeaea;
 }
@@ -897,20 +906,24 @@
   margin-right: 0.5rem;
 }
 .p-multiselect-panel .p-multiselect-header .p-multiselect-close {
-  width: auto;
-  height: auto;
-  color: #848484;
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
   border: 0 none;
   background: transparent;
-  border-radius: 3px;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
-  color: #333333;
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
+  color: #007ad9;
   border-color: transparent;
   background: transparent;
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0;
 }
@@ -1612,20 +1625,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: #ffffff;
-  border: 0 none;
-  color: #848484;
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  color: #a6a6a6;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin: 0.5rem;
+  margin: 0 0.5rem;
 }
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: #eaeaea;
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
+  color: #007ad9;
   border-color: transparent;
-  color: #848484;
+  background: transparent;
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1734,23 +1753,41 @@
   border-width: 1px;
   padding: 0.571rem 0.857rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
-  color: #848484;
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
-  color: #333333;
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
+  color: #007ad9;
+  border-color: transparent;
+  background: transparent;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: #007ad9;
   color: #ffffff;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #ffffff;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #ffffff;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 #007ad9;
 }
@@ -2064,20 +2101,15 @@
   padding: 0.571rem 1rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: #848484;
-  border-radius: 3px;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #8dcdff;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: #333333;
-}
 
 .p-paginator {
   background: #f4f4f4;
@@ -2244,11 +2276,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
-  color: #848484;
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
-  color: #333333;
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
+  color: #007ad9;
+  border-color: transparent;
+  background: transparent;
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2381,12 +2425,24 @@
   padding: 0.571rem 0.857rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
-  color: #848484;
-  margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
-  color: #333333;
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
+  color: #007ad9;
+  border-color: transparent;
+  background: transparent;
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2564,7 +2620,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: background-color 0.2s, box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 0.857rem 1rem;
@@ -2598,16 +2654,16 @@
   font-weight: 700;
 }
 .p-panel .p-panel-header .p-panel-header-icon {
-  width: auto;
-  height: auto;
-  color: #848484;
-  background: transparent;
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
   border: 0 none;
-  border-radius: 3px;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
-  color: #333333;
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
+  color: #007ad9;
   border-color: transparent;
   background: transparent;
 }
@@ -2714,17 +2770,17 @@
   font-size: 1rem;
 }
 .p-dialog .p-dialog-header .p-dialog-header-icon {
-  width: auto;
-  height: auto;
-  color: #848484;
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
   border: 0 none;
   background: transparent;
-  border-radius: 3px;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
-  color: #333333;
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
+  color: #007ad9;
   border-color: transparent;
   background: transparent;
 }
@@ -2771,19 +2827,17 @@
 }
 .p-overlaypanel .p-overlaypanel-close {
   background: #007ad9;
-  border: 0 none;
   color: #ffffff;
-  width: 1.538rem;
-  height: 1.538rem;
-  position: absolute;
-  top: -0.769rem;
-  right: -0.769rem;
-  border-radius: 50%;
+  width: 2rem;
+  height: 2rem;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
+  position: absolute;
+  top: -1rem;
+  right: -1rem;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
-  background: #005b9f;
-  border-color: transparent;
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
+  background: #116fbf;
   color: #ffffff;
 }
 .p-overlaypanel:after {
@@ -2811,18 +2865,23 @@
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.16);
 }
 .p-sidebar .p-sidebar-close {
-  background: #007ad9;
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
   border: 0 none;
-  color: #ffffff;
-  width: 1.538rem;
-  height: 1.538rem;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: #005b9f;
+.p-sidebar .p-sidebar-close:enabled:hover {
+  color: #007ad9;
   border-color: transparent;
-  color: #ffffff;
+  background: transparent;
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3301,21 +3360,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
-    color: #848484;
-    background: transparent;
-    border: 0 none;
     width: 2rem;
     height: 2rem;
+    color: #333333;
     border-radius: 50%;
     transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1rem;
-  }
   .p-menubar .p-menubar-button:hover {
     color: #333333;
-    background: transparent;
-    border-color: transparent;
+    background: #eaeaea;
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3733,6 +3786,21 @@
 .p-message .p-message-wrapper {
   padding: 1rem;
 }
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
+}
 .p-message.p-message-info {
   background: #7fbcec;
   border: 0 none;
@@ -3743,7 +3811,6 @@
   color: #212121;
 }
 .p-message.p-message-info .p-message-close {
-  background: #7fbcec;
   color: #212121;
 }
 .p-message.p-message-success {
@@ -3756,7 +3823,6 @@
   color: #212121;
 }
 .p-message.p-message-success .p-message-close {
-  background: #b7d8b7;
   color: #212121;
 }
 .p-message.p-message-warn {
@@ -3769,7 +3835,6 @@
   color: #212121;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #ffe399;
   color: #212121;
 }
 .p-message.p-message-error {
@@ -3782,23 +3847,8 @@
   color: #212121;
 }
 .p-message.p-message-error .p-message-close {
-  background: #f8b7bd;
   color: #212121;
 }
-.p-message .p-message-close {
-  border-radius: 3px;
-  width: auto;
-  height: auto;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-}
-.p-message .p-message-close:hover {
-  background: transparent;
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: 0 0 0 0.2rem #8dcdff;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: normal;
@@ -3833,13 +3883,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
-  border-radius: 3px;
-  width: auto;
-  height: auto;
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: transparent;
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #8dcdff;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #7fbcec;
@@ -4101,4 +4157,18 @@
   color: #ffffff;
 }
 
+.p-panel .p-panel-header .p-panel-header-icon {
+  color: #848484;
+}
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
+  color: #333333;
+}
+
+.p-dialog .p-dialog-header .p-dialog-header-icon {
+  color: #848484;
+}
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
+  color: #333333;
+}
+
 /* Customizations to the designer theme should be defined here */
diff --git a/public/themes/rhea/theme.css b/public/themes/rhea/theme.css
index 0f702dd3b..f3fc8ade8 100644
--- a/public/themes/rhea/theme.css
+++ b/public/themes/rhea/theme.css
@@ -158,20 +158,26 @@
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: auto;
-  height: auto;
+  width: 2rem;
+  height: 2rem;
   color: #a6a6a6;
   border: 0 none;
   background: transparent;
-  border-radius: 2px;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: #666666;
   border-color: transparent;
   background: transparent;
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #e4e9ec;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -238,17 +244,24 @@
   padding: 0.857rem 0 0.429rem 0;
 }
 .p-datepicker .p-timepicker button {
-  width: auto;
-  height: auto;
+  width: 2rem;
+  height: 2rem;
   color: #a6a6a6;
+  border: 0 none;
   background: transparent;
-  border-radius: 2px;
-  transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: #666666;
+  border-color: transparent;
   background: transparent;
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #e4e9ec;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -287,10 +300,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: #666666;
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: #f4f4f4;
 }
@@ -893,20 +902,24 @@
   margin-right: 0.5rem;
 }
 .p-multiselect-panel .p-multiselect-header .p-multiselect-close {
-  width: auto;
-  height: auto;
+  width: 2rem;
+  height: 2rem;
   color: #a6a6a6;
   border: 0 none;
   background: transparent;
-  border-radius: 2px;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
-  color: #7B95A3;
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
+  color: #666666;
   border-color: transparent;
   background: transparent;
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #e4e9ec;
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0;
 }
@@ -1604,20 +1617,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: #ffffff;
-  border: 0 none;
-  color: #a6a6a6;
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin: 0.5rem;
-}
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: #f4f4f4;
-  border-color: transparent;
   color: #a6a6a6;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin: 0 0.5rem;
+}
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
+  color: #666666;
+  border-color: transparent;
+  background: transparent;
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #e4e9ec;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1726,23 +1745,41 @@
   border-width: 1px;
   padding: 0.571rem 0.857rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
   color: #a6a6a6;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
   color: #666666;
+  border-color: transparent;
+  background: transparent;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #e4e9ec;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: #AFD3C8;
   color: #385048;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #385048;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #385048;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 #AFD3C8;
 }
@@ -2056,20 +2093,15 @@
   padding: 0.571rem 1rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: #a6a6a6;
-  border-radius: 2px;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #e4e9ec;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: #666666;
-}
 
 .p-paginator {
   background: #ffffff;
@@ -2236,11 +2268,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
   color: #a6a6a6;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
   color: #666666;
+  border-color: transparent;
+  background: transparent;
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #e4e9ec;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2373,12 +2417,24 @@
   padding: 0.571rem 0.857rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
+  width: 2rem;
+  height: 2rem;
   color: #a6a6a6;
-  margin-right: 0.5rem;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
   color: #666666;
+  border-color: transparent;
+  background: transparent;
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #e4e9ec;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2556,7 +2612,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 0.857rem 1rem;
@@ -2590,16 +2646,16 @@
   font-weight: 700;
 }
 .p-panel .p-panel-header .p-panel-header-icon {
-  width: auto;
-  height: auto;
-  color: #ffffff;
-  background: transparent;
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
   border: 0 none;
-  border-radius: 2px;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
-  color: #ffffff;
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
+  color: #666666;
   border-color: transparent;
   background: transparent;
 }
@@ -2706,17 +2762,17 @@
   font-size: 1rem;
 }
 .p-dialog .p-dialog-header .p-dialog-header-icon {
-  width: auto;
-  height: auto;
-  color: #ffffff;
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
   border: 0 none;
   background: transparent;
-  border-radius: 2px;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
-  color: #ffffff;
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
+  color: #666666;
   border-color: transparent;
   background: transparent;
 }
@@ -2763,19 +2819,17 @@
 }
 .p-overlaypanel .p-overlaypanel-close {
   background: #7B95A3;
-  border: 0 none;
   color: #ffffff;
-  width: 1.538rem;
-  height: 1.538rem;
-  position: absolute;
-  top: -0.769rem;
-  right: -0.769rem;
-  border-radius: 50%;
+  width: 2rem;
+  height: 2rem;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
+  position: absolute;
+  top: -1rem;
+  right: -1rem;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
-  background: #617c8a;
-  border-color: transparent;
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
+  background: #6c8999;
   color: #ffffff;
 }
 .p-overlaypanel:after {
@@ -2803,18 +2857,23 @@
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.16);
 }
 .p-sidebar .p-sidebar-close {
-  background: #7B95A3;
+  width: 2rem;
+  height: 2rem;
+  color: #a6a6a6;
   border: 0 none;
-  color: #ffffff;
-  width: 1.538rem;
-  height: 1.538rem;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: #617c8a;
+.p-sidebar .p-sidebar-close:enabled:hover {
+  color: #666666;
   border-color: transparent;
-  color: #ffffff;
+  background: transparent;
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #e4e9ec;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3293,21 +3352,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
-    color: #ffffff;
-    background: transparent;
-    border: 0 none;
     width: 2rem;
     height: 2rem;
+    color: #666666;
     border-radius: 50%;
     transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1rem;
-  }
   .p-menubar .p-menubar-button:hover {
-    color: #ffffff;
-    background: transparent;
-    border-color: transparent;
+    color: #666666;
+    background: #eaeaea;
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3725,6 +3778,21 @@
 .p-message .p-message-wrapper {
   padding: 1rem;
 }
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #e4e9ec;
+}
 .p-message.p-message-info {
   background: #A3DEF8;
   border: 1px solid #79C8EB;
@@ -3735,7 +3803,6 @@
   color: #212121;
 }
 .p-message.p-message-info .p-message-close {
-  background: #A3DEF8;
   color: #212121;
 }
 .p-message.p-message-success {
@@ -3748,7 +3815,6 @@
   color: #212121;
 }
 .p-message.p-message-success .p-message-close {
-  background: #A3E2C6;
   color: #212121;
 }
 .p-message.p-message-warn {
@@ -3761,7 +3827,6 @@
   color: #212121;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #ffe277;
   color: #212121;
 }
 .p-message.p-message-error {
@@ -3774,23 +3839,8 @@
   color: #212121;
 }
 .p-message.p-message-error .p-message-close {
-  background: #ff8b8b;
   color: #212121;
 }
-.p-message .p-message-close {
-  border-radius: 2px;
-  width: auto;
-  height: auto;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-}
-.p-message .p-message-close:hover {
-  background: transparent;
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: 0 0 0 0.2rem #e4e9ec;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: normal;
@@ -3825,13 +3875,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
-  border-radius: 2px;
-  width: auto;
-  height: auto;
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: transparent;
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #e4e9ec;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #A3DEF8;
@@ -4093,4 +4149,18 @@
   color: #262222;
 }
 
+.p-panel .p-panel-header .p-panel-header-icon {
+  color: #ffffff;
+}
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
+  color: #ffffff;
+}
+
+.p-dialog .p-dialog-header .p-dialog-header-icon {
+  color: #ffffff;
+}
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
+  color: #ffffff;
+}
+
 /* Customizations to the designer theme should be defined here */
diff --git a/public/themes/saga-blue/theme.css b/public/themes/saga-blue/theme.css
index 06f522bee..8d049e2a6 100644
--- a/public/themes/saga-blue/theme.css
+++ b/public/themes/saga-blue/theme.css
@@ -158,20 +158,26 @@
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: #6c757d;
   border: 0 none;
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: #495057;
   border-color: transparent;
   background: #e9ecef;
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #BBDEFB;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -238,17 +244,24 @@
   padding: 0.5rem;
 }
 .p-datepicker .p-timepicker button {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: #6c757d;
+  border: 0 none;
   background: transparent;
   border-radius: 50%;
-  transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: #495057;
+  border-color: transparent;
   background: #e9ecef;
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #BBDEFB;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -287,10 +300,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: #495057;
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: #e9ecef;
 }
@@ -904,12 +913,16 @@
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
   color: #495057;
   border-color: transparent;
-  background: #dee2e6;
+  background: #e9ecef;
+}
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #BBDEFB;
 }
 .p-multiselect-panel .p-multiselect-items {
   padding: 0.5rem 0;
@@ -1612,20 +1625,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: #ffffff;
-  border: 0 none;
-  color: #6c757d;
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  color: #6c757d;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin: 0.5rem;
+  margin: 0 0.5rem;
 }
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: #e9ecef;
-  border-color: transparent;
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
   color: #495057;
+  border-color: transparent;
+  background: #e9ecef;
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #BBDEFB;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1734,23 +1753,41 @@
   border-width: 0 0 1px 0;
   padding: 1rem 1rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
   color: #6c757d;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
   color: #495057;
+  border-color: transparent;
+  background: #e9ecef;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #BBDEFB;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: #2196F3;
   color: #ffffff;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #ffffff;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #ffffff;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 #2196F3;
 }
@@ -2064,20 +2101,15 @@
   padding: 1rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: #6c757d;
-  border-radius: 3px;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #BBDEFB;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: #495057;
-}
 
 .p-paginator {
   background: #ffffff;
@@ -2244,11 +2276,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
   color: #6c757d;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
   color: #495057;
+  border-color: transparent;
+  background: #e9ecef;
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #BBDEFB;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2381,12 +2425,24 @@
   padding: 1rem 1rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
+  width: 2rem;
+  height: 2rem;
   color: #6c757d;
-  margin-right: 0.5rem;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
   color: #495057;
+  border-color: transparent;
+  background: #e9ecef;
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #BBDEFB;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2581,7 +2637,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 1rem;
@@ -2618,12 +2674,12 @@
   width: 2rem;
   height: 2rem;
   color: #6c757d;
-  background: transparent;
   border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
   color: #495057;
   border-color: transparent;
   background: #e9ecef;
@@ -2740,7 +2796,7 @@
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
   color: #495057;
   border-color: transparent;
   background: #e9ecef;
@@ -2788,19 +2844,17 @@
 }
 .p-overlaypanel .p-overlaypanel-close {
   background: #2196F3;
-  border: 0 none;
   color: #ffffff;
   width: 2rem;
   height: 2rem;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
   position: absolute;
   top: -1rem;
   right: -1rem;
-  border-radius: 50%;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
   background: #1E88E5;
-  border-color: transparent;
   color: #ffffff;
 }
 .p-overlaypanel:after {
@@ -2828,18 +2882,23 @@
   box-shadow: 0px 11px 15px -7px rgba(0, 0, 0, 0.2), 0px 24px 38px 3px rgba(0, 0, 0, 0.14), 0px 9px 46px 8px rgba(0, 0, 0, 0.12);
 }
 .p-sidebar .p-sidebar-close {
-  background: transparent;
-  border: 0 none;
-  color: #6c757d;
   width: 2rem;
   height: 2rem;
+  color: #6c757d;
+  border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: #e9ecef;
-  border-color: transparent;
+.p-sidebar .p-sidebar-close:enabled:hover {
   color: #495057;
+  border-color: transparent;
+  background: #e9ecef;
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #BBDEFB;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3318,21 +3377,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
+    width: 2rem;
+    height: 2rem;
     color: #6c757d;
-    background: transparent;
-    border: 0 none;
-    width: 2.5rem;
-    height: 2.5rem;
     border-radius: 50%;
     transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1.5rem;
-  }
   .p-menubar .p-menubar-button:hover {
-    color: #495057;
+    color: #6c757d;
     background: #e9ecef;
-    border-color: transparent;
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3767,6 +3820,21 @@
 .p-message .p-message-wrapper {
   padding: 1rem 1.5rem;
 }
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #BBDEFB;
+}
 .p-message.p-message-info {
   background: #B3E5FC;
   border: solid #03A9F4;
@@ -3777,7 +3845,6 @@
   color: #01579B;
 }
 .p-message.p-message-info .p-message-close {
-  background: #B3E5FC;
   color: #01579B;
 }
 .p-message.p-message-success {
@@ -3790,7 +3857,6 @@
   color: #1B5E20;
 }
 .p-message.p-message-success .p-message-close {
-  background: #C8E6C9;
   color: #1B5E20;
 }
 .p-message.p-message-warn {
@@ -3803,7 +3869,6 @@
   color: #7f6003;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #FFECB3;
   color: #7f6003;
 }
 .p-message.p-message-error {
@@ -3816,23 +3881,8 @@
   color: #B71C1C;
 }
 .p-message.p-message-error .p-message-close {
-  background: #FFCDD2;
   color: #B71C1C;
 }
-.p-message .p-message-close {
-  border-radius: 50%;
-  width: 2rem;
-  height: 2rem;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-}
-.p-message .p-message-close:hover {
-  background: rgba(255, 255, 255, 0.2);
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: 0 0 0 0.2rem #BBDEFB;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: 500;
@@ -3867,13 +3917,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  border-radius: 50%;
+  background: transparent;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: rgba(255, 255, 255, 0.2);
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #BBDEFB;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #B3E5FC;
diff --git a/public/themes/saga-green/theme.css b/public/themes/saga-green/theme.css
index 7ac577e41..9521a9f5d 100644
--- a/public/themes/saga-green/theme.css
+++ b/public/themes/saga-green/theme.css
@@ -158,20 +158,26 @@
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: #6c757d;
   border: 0 none;
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: #495057;
   border-color: transparent;
   background: #e9ecef;
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #C8E6C9;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -238,17 +244,24 @@
   padding: 0.5rem;
 }
 .p-datepicker .p-timepicker button {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: #6c757d;
+  border: 0 none;
   background: transparent;
   border-radius: 50%;
-  transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: #495057;
+  border-color: transparent;
   background: #e9ecef;
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #C8E6C9;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -287,10 +300,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: #495057;
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: #e9ecef;
 }
@@ -904,12 +913,16 @@
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
   color: #495057;
   border-color: transparent;
-  background: #dee2e6;
+  background: #e9ecef;
+}
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #C8E6C9;
 }
 .p-multiselect-panel .p-multiselect-items {
   padding: 0.5rem 0;
@@ -1612,20 +1625,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: #ffffff;
-  border: 0 none;
-  color: #6c757d;
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  color: #6c757d;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin: 0.5rem;
+  margin: 0 0.5rem;
 }
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: #e9ecef;
-  border-color: transparent;
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
   color: #495057;
+  border-color: transparent;
+  background: #e9ecef;
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #C8E6C9;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1734,23 +1753,41 @@
   border-width: 0 0 1px 0;
   padding: 1rem 1rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
   color: #6c757d;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
   color: #495057;
+  border-color: transparent;
+  background: #e9ecef;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #C8E6C9;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: #4CAF50;
   color: #ffffff;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #ffffff;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #ffffff;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 #4CAF50;
 }
@@ -2064,20 +2101,15 @@
   padding: 1rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: #6c757d;
-  border-radius: 3px;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #C8E6C9;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: #495057;
-}
 
 .p-paginator {
   background: #ffffff;
@@ -2244,11 +2276,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
   color: #6c757d;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
   color: #495057;
+  border-color: transparent;
+  background: #e9ecef;
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #C8E6C9;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2381,12 +2425,24 @@
   padding: 1rem 1rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
+  width: 2rem;
+  height: 2rem;
   color: #6c757d;
-  margin-right: 0.5rem;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
   color: #495057;
+  border-color: transparent;
+  background: #e9ecef;
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #C8E6C9;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2581,7 +2637,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 1rem;
@@ -2618,12 +2674,12 @@
   width: 2rem;
   height: 2rem;
   color: #6c757d;
-  background: transparent;
   border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
   color: #495057;
   border-color: transparent;
   background: #e9ecef;
@@ -2740,7 +2796,7 @@
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
   color: #495057;
   border-color: transparent;
   background: #e9ecef;
@@ -2788,19 +2844,17 @@
 }
 .p-overlaypanel .p-overlaypanel-close {
   background: #4CAF50;
-  border: 0 none;
   color: #ffffff;
   width: 2rem;
   height: 2rem;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
   position: absolute;
   top: -1rem;
   right: -1rem;
-  border-radius: 50%;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
   background: #43A047;
-  border-color: transparent;
   color: #ffffff;
 }
 .p-overlaypanel:after {
@@ -2828,18 +2882,23 @@
   box-shadow: 0px 11px 15px -7px rgba(0, 0, 0, 0.2), 0px 24px 38px 3px rgba(0, 0, 0, 0.14), 0px 9px 46px 8px rgba(0, 0, 0, 0.12);
 }
 .p-sidebar .p-sidebar-close {
-  background: transparent;
-  border: 0 none;
-  color: #6c757d;
   width: 2rem;
   height: 2rem;
+  color: #6c757d;
+  border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: #e9ecef;
-  border-color: transparent;
+.p-sidebar .p-sidebar-close:enabled:hover {
   color: #495057;
+  border-color: transparent;
+  background: #e9ecef;
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #C8E6C9;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3318,21 +3377,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
+    width: 2rem;
+    height: 2rem;
     color: #6c757d;
-    background: transparent;
-    border: 0 none;
-    width: 2.5rem;
-    height: 2.5rem;
     border-radius: 50%;
     transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1.5rem;
-  }
   .p-menubar .p-menubar-button:hover {
-    color: #495057;
+    color: #6c757d;
     background: #e9ecef;
-    border-color: transparent;
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3767,6 +3820,21 @@
 .p-message .p-message-wrapper {
   padding: 1rem 1.5rem;
 }
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #C8E6C9;
+}
 .p-message.p-message-info {
   background: #B3E5FC;
   border: solid #03A9F4;
@@ -3777,7 +3845,6 @@
   color: #01579B;
 }
 .p-message.p-message-info .p-message-close {
-  background: #B3E5FC;
   color: #01579B;
 }
 .p-message.p-message-success {
@@ -3790,7 +3857,6 @@
   color: #1B5E20;
 }
 .p-message.p-message-success .p-message-close {
-  background: #C8E6C9;
   color: #1B5E20;
 }
 .p-message.p-message-warn {
@@ -3803,7 +3869,6 @@
   color: #7f6003;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #FFECB3;
   color: #7f6003;
 }
 .p-message.p-message-error {
@@ -3816,23 +3881,8 @@
   color: #B71C1C;
 }
 .p-message.p-message-error .p-message-close {
-  background: #FFCDD2;
   color: #B71C1C;
 }
-.p-message .p-message-close {
-  border-radius: 50%;
-  width: 2rem;
-  height: 2rem;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-}
-.p-message .p-message-close:hover {
-  background: rgba(255, 255, 255, 0.2);
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: 0 0 0 0.2rem #C8E6C9;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: 500;
@@ -3867,13 +3917,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  border-radius: 50%;
+  background: transparent;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: rgba(255, 255, 255, 0.2);
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #C8E6C9;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #B3E5FC;
diff --git a/public/themes/saga-orange/theme.css b/public/themes/saga-orange/theme.css
index 6bfb67c7d..e40d256d2 100644
--- a/public/themes/saga-orange/theme.css
+++ b/public/themes/saga-orange/theme.css
@@ -158,20 +158,26 @@
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: #6c757d;
   border: 0 none;
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: #495057;
   border-color: transparent;
   background: #e9ecef;
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #FFECB3;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -238,17 +244,24 @@
   padding: 0.5rem;
 }
 .p-datepicker .p-timepicker button {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: #6c757d;
+  border: 0 none;
   background: transparent;
   border-radius: 50%;
-  transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: #495057;
+  border-color: transparent;
   background: #e9ecef;
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #FFECB3;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -287,10 +300,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: #495057;
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: #e9ecef;
 }
@@ -904,12 +913,16 @@
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
   color: #495057;
   border-color: transparent;
-  background: #dee2e6;
+  background: #e9ecef;
+}
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #FFECB3;
 }
 .p-multiselect-panel .p-multiselect-items {
   padding: 0.5rem 0;
@@ -1612,20 +1625,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: #ffffff;
-  border: 0 none;
-  color: #6c757d;
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  color: #6c757d;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin: 0.5rem;
+  margin: 0 0.5rem;
 }
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: #e9ecef;
-  border-color: transparent;
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
   color: #495057;
+  border-color: transparent;
+  background: #e9ecef;
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #FFECB3;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1734,23 +1753,41 @@
   border-width: 0 0 1px 0;
   padding: 1rem 1rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
   color: #6c757d;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
   color: #495057;
+  border-color: transparent;
+  background: #e9ecef;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #FFECB3;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: #FFC107;
   color: #212529;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #212529;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #212529;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 #FFC107;
 }
@@ -2064,20 +2101,15 @@
   padding: 1rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: #6c757d;
-  border-radius: 3px;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #FFECB3;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: #495057;
-}
 
 .p-paginator {
   background: #ffffff;
@@ -2244,11 +2276,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
   color: #6c757d;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
   color: #495057;
+  border-color: transparent;
+  background: #e9ecef;
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #FFECB3;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2381,12 +2425,24 @@
   padding: 1rem 1rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
+  width: 2rem;
+  height: 2rem;
   color: #6c757d;
-  margin-right: 0.5rem;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
   color: #495057;
+  border-color: transparent;
+  background: #e9ecef;
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #FFECB3;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2581,7 +2637,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 1rem;
@@ -2618,12 +2674,12 @@
   width: 2rem;
   height: 2rem;
   color: #6c757d;
-  background: transparent;
   border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
   color: #495057;
   border-color: transparent;
   background: #e9ecef;
@@ -2740,7 +2796,7 @@
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
   color: #495057;
   border-color: transparent;
   background: #e9ecef;
@@ -2788,19 +2844,17 @@
 }
 .p-overlaypanel .p-overlaypanel-close {
   background: #FFC107;
-  border: 0 none;
   color: #212529;
   width: 2rem;
   height: 2rem;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
   position: absolute;
   top: -1rem;
   right: -1rem;
-  border-radius: 50%;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
   background: #FFB300;
-  border-color: transparent;
   color: #212529;
 }
 .p-overlaypanel:after {
@@ -2828,18 +2882,23 @@
   box-shadow: 0px 11px 15px -7px rgba(0, 0, 0, 0.2), 0px 24px 38px 3px rgba(0, 0, 0, 0.14), 0px 9px 46px 8px rgba(0, 0, 0, 0.12);
 }
 .p-sidebar .p-sidebar-close {
-  background: transparent;
-  border: 0 none;
-  color: #6c757d;
   width: 2rem;
   height: 2rem;
+  color: #6c757d;
+  border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: #e9ecef;
-  border-color: transparent;
+.p-sidebar .p-sidebar-close:enabled:hover {
   color: #495057;
+  border-color: transparent;
+  background: #e9ecef;
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #FFECB3;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3318,21 +3377,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
+    width: 2rem;
+    height: 2rem;
     color: #6c757d;
-    background: transparent;
-    border: 0 none;
-    width: 2.5rem;
-    height: 2.5rem;
     border-radius: 50%;
     transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1.5rem;
-  }
   .p-menubar .p-menubar-button:hover {
-    color: #495057;
+    color: #6c757d;
     background: #e9ecef;
-    border-color: transparent;
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3767,6 +3820,21 @@
 .p-message .p-message-wrapper {
   padding: 1rem 1.5rem;
 }
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #FFECB3;
+}
 .p-message.p-message-info {
   background: #B3E5FC;
   border: solid #03A9F4;
@@ -3777,7 +3845,6 @@
   color: #01579B;
 }
 .p-message.p-message-info .p-message-close {
-  background: #B3E5FC;
   color: #01579B;
 }
 .p-message.p-message-success {
@@ -3790,7 +3857,6 @@
   color: #1B5E20;
 }
 .p-message.p-message-success .p-message-close {
-  background: #C8E6C9;
   color: #1B5E20;
 }
 .p-message.p-message-warn {
@@ -3803,7 +3869,6 @@
   color: #7f6003;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #FFECB3;
   color: #7f6003;
 }
 .p-message.p-message-error {
@@ -3816,23 +3881,8 @@
   color: #B71C1C;
 }
 .p-message.p-message-error .p-message-close {
-  background: #FFCDD2;
   color: #B71C1C;
 }
-.p-message .p-message-close {
-  border-radius: 50%;
-  width: 2rem;
-  height: 2rem;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-}
-.p-message .p-message-close:hover {
-  background: rgba(255, 255, 255, 0.2);
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: 0 0 0 0.2rem #FFECB3;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: 500;
@@ -3867,13 +3917,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  border-radius: 50%;
+  background: transparent;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: rgba(255, 255, 255, 0.2);
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 0.2rem #FFECB3;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #B3E5FC;
diff --git a/public/themes/vela-blue/theme.css b/public/themes/vela-blue/theme.css
index c441c4180..c8f1c7bd0 100644
--- a/public/themes/vela-blue/theme.css
+++ b/public/themes/vela-blue/theme.css
@@ -158,20 +158,26 @@
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
   border: 0 none;
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #BBDEFB;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -238,17 +244,24 @@
   padding: 0.5rem;
 }
 .p-datepicker .p-timepicker button {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
   background: transparent;
   border-radius: 50%;
-  transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #BBDEFB;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -287,10 +300,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: rgba(255, 255, 255, 0.87);
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: rgba(255, 255, 255, 0.03);
 }
@@ -904,13 +913,17 @@
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #BBDEFB;
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0.5rem 0;
 }
@@ -1612,20 +1625,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: transparent;
-  border: 0 none;
-  color: rgba(255, 255, 255, 0.6);
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin: 0.5rem;
+  margin: 0 0.5rem;
 }
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: rgba(255, 255, 255, 0.03);
-  border-color: transparent;
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #BBDEFB;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1734,23 +1753,41 @@
   border-width: 0 0 1px 0;
   padding: 1rem 1rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #BBDEFB;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: #64B5F6;
   color: #212529;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #212529;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #212529;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 #64B5F6;
 }
@@ -2064,20 +2101,15 @@
   padding: 1rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: rgba(255, 255, 255, 0.6);
-  border-radius: 3px;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 1px #BBDEFB;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: rgba(255, 255, 255, 0.87);
-}
 
 .p-paginator {
   background: #1f2d40;
@@ -2244,11 +2276,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #BBDEFB;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2381,12 +2425,24 @@
   padding: 1rem 1rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
-  margin-right: 0.5rem;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #BBDEFB;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2581,7 +2637,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 1rem;
@@ -2618,12 +2674,12 @@
   width: 2rem;
   height: 2rem;
   color: rgba(255, 255, 255, 0.6);
-  background: transparent;
   border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
@@ -2740,7 +2796,7 @@
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
@@ -2788,19 +2844,17 @@
 }
 .p-overlaypanel .p-overlaypanel-close {
   background: #64B5F6;
-  border: 0 none;
   color: #212529;
   width: 2rem;
   height: 2rem;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
   position: absolute;
   top: -1rem;
   right: -1rem;
-  border-radius: 50%;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
-  background: #2196F3;
-  border-color: transparent;
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
+  background: #42A5F5;
   color: #212529;
 }
 .p-overlaypanel:after {
@@ -2828,18 +2882,23 @@
   box-shadow: 0px 11px 15px -7px rgba(0, 0, 0, 0.2), 0px 24px 38px 3px rgba(0, 0, 0, 0.14), 0px 9px 46px 8px rgba(0, 0, 0, 0.12);
 }
 .p-sidebar .p-sidebar-close {
-  background: transparent;
-  border: 0 none;
-  color: rgba(255, 255, 255, 0.6);
   width: 2rem;
   height: 2rem;
+  color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: rgba(255, 255, 255, 0.03);
-  border-color: transparent;
+.p-sidebar .p-sidebar-close:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #BBDEFB;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3318,21 +3377,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
+    width: 2rem;
+    height: 2rem;
     color: rgba(255, 255, 255, 0.6);
-    background: transparent;
-    border: 0 none;
-    width: 2.5rem;
-    height: 2.5rem;
     border-radius: 50%;
     transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1.5rem;
-  }
   .p-menubar .p-menubar-button:hover {
     color: rgba(255, 255, 255, 0.87);
     background: rgba(255, 255, 255, 0.03);
-    border-color: transparent;
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3767,6 +3820,21 @@
 .p-message .p-message-wrapper {
   padding: 1rem 1.5rem;
 }
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #BBDEFB;
+}
 .p-message.p-message-info {
   background: #B3E5FC;
   border: solid #03A9F4;
@@ -3777,7 +3845,6 @@
   color: #01579B;
 }
 .p-message.p-message-info .p-message-close {
-  background: #B3E5FC;
   color: #01579B;
 }
 .p-message.p-message-success {
@@ -3790,7 +3857,6 @@
   color: #1B5E20;
 }
 .p-message.p-message-success .p-message-close {
-  background: #C8E6C9;
   color: #1B5E20;
 }
 .p-message.p-message-warn {
@@ -3803,7 +3869,6 @@
   color: #7f6003;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #FFECB3;
   color: #7f6003;
 }
 .p-message.p-message-error {
@@ -3816,23 +3881,8 @@
   color: #B71C1C;
 }
 .p-message.p-message-error .p-message-close {
-  background: #FFCDD2;
   color: #B71C1C;
 }
-.p-message .p-message-close {
-  border-radius: 50%;
-  width: 2rem;
-  height: 2rem;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-}
-.p-message .p-message-close:hover {
-  background: rgba(255, 255, 255, 0.5);
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: 0 0 0 1px #BBDEFB;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: 500;
@@ -3867,13 +3917,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  border-radius: 50%;
+  background: transparent;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: rgba(255, 255, 255, 0.2);
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #BBDEFB;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #B3E5FC;
diff --git a/public/themes/vela-green/theme.css b/public/themes/vela-green/theme.css
index e647dc3cc..4df92e1bd 100644
--- a/public/themes/vela-green/theme.css
+++ b/public/themes/vela-green/theme.css
@@ -158,20 +158,26 @@
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
   border: 0 none;
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #C8E6C9;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -238,17 +244,24 @@
   padding: 0.5rem;
 }
 .p-datepicker .p-timepicker button {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
   background: transparent;
   border-radius: 50%;
-  transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #C8E6C9;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -287,10 +300,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: rgba(255, 255, 255, 0.87);
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: rgba(255, 255, 255, 0.03);
 }
@@ -904,13 +913,17 @@
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #C8E6C9;
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0.5rem 0;
 }
@@ -1612,20 +1625,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: transparent;
-  border: 0 none;
-  color: rgba(255, 255, 255, 0.6);
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin: 0.5rem;
+  margin: 0 0.5rem;
 }
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: rgba(255, 255, 255, 0.03);
-  border-color: transparent;
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #C8E6C9;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1734,23 +1753,41 @@
   border-width: 0 0 1px 0;
   padding: 1rem 1rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #C8E6C9;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: #81C784;
   color: #212529;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #212529;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #212529;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 #81C784;
 }
@@ -2064,20 +2101,15 @@
   padding: 1rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: rgba(255, 255, 255, 0.6);
-  border-radius: 3px;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 1px #C8E6C9;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: rgba(255, 255, 255, 0.87);
-}
 
 .p-paginator {
   background: #1f2d40;
@@ -2244,11 +2276,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #C8E6C9;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2381,12 +2425,24 @@
   padding: 1rem 1rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
-  margin-right: 0.5rem;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #C8E6C9;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2581,7 +2637,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 1rem;
@@ -2618,12 +2674,12 @@
   width: 2rem;
   height: 2rem;
   color: rgba(255, 255, 255, 0.6);
-  background: transparent;
   border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
@@ -2740,7 +2796,7 @@
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
@@ -2788,19 +2844,17 @@
 }
 .p-overlaypanel .p-overlaypanel-close {
   background: #81C784;
-  border: 0 none;
   color: #212529;
   width: 2rem;
   height: 2rem;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
   position: absolute;
   top: -1rem;
   right: -1rem;
-  border-radius: 50%;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
-  background: #4CAF50;
-  border-color: transparent;
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
+  background: #66BB6A;
   color: #212529;
 }
 .p-overlaypanel:after {
@@ -2828,18 +2882,23 @@
   box-shadow: 0px 11px 15px -7px rgba(0, 0, 0, 0.2), 0px 24px 38px 3px rgba(0, 0, 0, 0.14), 0px 9px 46px 8px rgba(0, 0, 0, 0.12);
 }
 .p-sidebar .p-sidebar-close {
-  background: transparent;
-  border: 0 none;
-  color: rgba(255, 255, 255, 0.6);
   width: 2rem;
   height: 2rem;
+  color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: rgba(255, 255, 255, 0.03);
-  border-color: transparent;
+.p-sidebar .p-sidebar-close:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #C8E6C9;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3318,21 +3377,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
+    width: 2rem;
+    height: 2rem;
     color: rgba(255, 255, 255, 0.6);
-    background: transparent;
-    border: 0 none;
-    width: 2.5rem;
-    height: 2.5rem;
     border-radius: 50%;
     transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1.5rem;
-  }
   .p-menubar .p-menubar-button:hover {
     color: rgba(255, 255, 255, 0.87);
     background: rgba(255, 255, 255, 0.03);
-    border-color: transparent;
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3767,6 +3820,21 @@
 .p-message .p-message-wrapper {
   padding: 1rem 1.5rem;
 }
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #C8E6C9;
+}
 .p-message.p-message-info {
   background: #B3E5FC;
   border: solid #03A9F4;
@@ -3777,7 +3845,6 @@
   color: #01579B;
 }
 .p-message.p-message-info .p-message-close {
-  background: #B3E5FC;
   color: #01579B;
 }
 .p-message.p-message-success {
@@ -3790,7 +3857,6 @@
   color: #1B5E20;
 }
 .p-message.p-message-success .p-message-close {
-  background: #C8E6C9;
   color: #1B5E20;
 }
 .p-message.p-message-warn {
@@ -3803,7 +3869,6 @@
   color: #7f6003;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #FFECB3;
   color: #7f6003;
 }
 .p-message.p-message-error {
@@ -3816,23 +3881,8 @@
   color: #B71C1C;
 }
 .p-message.p-message-error .p-message-close {
-  background: #FFCDD2;
   color: #B71C1C;
 }
-.p-message .p-message-close {
-  border-radius: 50%;
-  width: 2rem;
-  height: 2rem;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-}
-.p-message .p-message-close:hover {
-  background: rgba(255, 255, 255, 0.5);
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: 0 0 0 1px #C8E6C9;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: 500;
@@ -3867,13 +3917,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  border-radius: 50%;
+  background: transparent;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: rgba(255, 255, 255, 0.2);
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #C8E6C9;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #B3E5FC;
diff --git a/public/themes/vela-orange/theme.css b/public/themes/vela-orange/theme.css
index 19ae4e587..ebb9ce0fc 100644
--- a/public/themes/vela-orange/theme.css
+++ b/public/themes/vela-orange/theme.css
@@ -158,20 +158,26 @@
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
   border: 0 none;
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #FFECB3;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -238,17 +244,24 @@
   padding: 0.5rem;
 }
 .p-datepicker .p-timepicker button {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
   background: transparent;
   border-radius: 50%;
-  transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #FFECB3;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -287,10 +300,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: rgba(255, 255, 255, 0.87);
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: rgba(255, 255, 255, 0.03);
 }
@@ -904,13 +913,17 @@
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #FFECB3;
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0.5rem 0;
 }
@@ -1612,20 +1625,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: transparent;
-  border: 0 none;
-  color: rgba(255, 255, 255, 0.6);
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin: 0.5rem;
+  margin: 0 0.5rem;
 }
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: rgba(255, 255, 255, 0.03);
-  border-color: transparent;
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #FFECB3;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1734,23 +1753,41 @@
   border-width: 0 0 1px 0;
   padding: 1rem 1rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #FFECB3;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: #FFD54F;
   color: #212529;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #212529;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #212529;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 #FFD54F;
 }
@@ -2064,20 +2101,15 @@
   padding: 1rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: rgba(255, 255, 255, 0.6);
-  border-radius: 3px;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 1px #FFECB3;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: rgba(255, 255, 255, 0.87);
-}
 
 .p-paginator {
   background: #1f2d40;
@@ -2244,11 +2276,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #FFECB3;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2381,12 +2425,24 @@
   padding: 1rem 1rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
-  margin-right: 0.5rem;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #FFECB3;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2581,7 +2637,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 1rem;
@@ -2618,12 +2674,12 @@
   width: 2rem;
   height: 2rem;
   color: rgba(255, 255, 255, 0.6);
-  background: transparent;
   border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
@@ -2740,7 +2796,7 @@
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
@@ -2788,19 +2844,17 @@
 }
 .p-overlaypanel .p-overlaypanel-close {
   background: #FFD54F;
-  border: 0 none;
   color: #212529;
   width: 2rem;
   height: 2rem;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
   position: absolute;
   top: -1rem;
   right: -1rem;
-  border-radius: 50%;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
-  background: #FFC107;
-  border-color: transparent;
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
+  background: #FFCA28;
   color: #212529;
 }
 .p-overlaypanel:after {
@@ -2828,18 +2882,23 @@
   box-shadow: 0px 11px 15px -7px rgba(0, 0, 0, 0.2), 0px 24px 38px 3px rgba(0, 0, 0, 0.14), 0px 9px 46px 8px rgba(0, 0, 0, 0.12);
 }
 .p-sidebar .p-sidebar-close {
-  background: transparent;
-  border: 0 none;
-  color: rgba(255, 255, 255, 0.6);
   width: 2rem;
   height: 2rem;
+  color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: rgba(255, 255, 255, 0.03);
-  border-color: transparent;
+.p-sidebar .p-sidebar-close:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #FFECB3;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3318,21 +3377,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
+    width: 2rem;
+    height: 2rem;
     color: rgba(255, 255, 255, 0.6);
-    background: transparent;
-    border: 0 none;
-    width: 2.5rem;
-    height: 2.5rem;
     border-radius: 50%;
     transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1.5rem;
-  }
   .p-menubar .p-menubar-button:hover {
     color: rgba(255, 255, 255, 0.87);
     background: rgba(255, 255, 255, 0.03);
-    border-color: transparent;
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3767,6 +3820,21 @@
 .p-message .p-message-wrapper {
   padding: 1rem 1.5rem;
 }
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #FFECB3;
+}
 .p-message.p-message-info {
   background: #B3E5FC;
   border: solid #03A9F4;
@@ -3777,7 +3845,6 @@
   color: #01579B;
 }
 .p-message.p-message-info .p-message-close {
-  background: #B3E5FC;
   color: #01579B;
 }
 .p-message.p-message-success {
@@ -3790,7 +3857,6 @@
   color: #1B5E20;
 }
 .p-message.p-message-success .p-message-close {
-  background: #C8E6C9;
   color: #1B5E20;
 }
 .p-message.p-message-warn {
@@ -3803,7 +3869,6 @@
   color: #7f6003;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #FFECB3;
   color: #7f6003;
 }
 .p-message.p-message-error {
@@ -3816,23 +3881,8 @@
   color: #B71C1C;
 }
 .p-message.p-message-error .p-message-close {
-  background: #FFCDD2;
   color: #B71C1C;
 }
-.p-message .p-message-close {
-  border-radius: 50%;
-  width: 2rem;
-  height: 2rem;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-}
-.p-message .p-message-close:hover {
-  background: rgba(255, 255, 255, 0.5);
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: 0 0 0 1px #FFECB3;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: 500;
@@ -3867,13 +3917,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  border-radius: 50%;
+  background: transparent;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: rgba(255, 255, 255, 0.2);
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #FFECB3;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #B3E5FC;
diff --git a/public/themes/vela-purple/theme.css b/public/themes/vela-purple/theme.css
index a1faa68bf..371331cd7 100644
--- a/public/themes/vela-purple/theme.css
+++ b/public/themes/vela-purple/theme.css
@@ -158,20 +158,26 @@
 }
 .p-datepicker .p-datepicker-header .p-datepicker-prev,
 .p-datepicker .p-datepicker-header .p-datepicker-next {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
   border: 0 none;
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker .p-datepicker-header .p-datepicker-next:hover {
+.p-datepicker .p-datepicker-header .p-datepicker-prev:enabled:hover,
+.p-datepicker .p-datepicker-header .p-datepicker-next:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
 }
+.p-datepicker .p-datepicker-header .p-datepicker-prev:focus,
+.p-datepicker .p-datepicker-header .p-datepicker-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #E1BEE7;
+}
 .p-datepicker .p-datepicker-header .p-datepicker-title {
   line-height: 1;
 }
@@ -238,17 +244,24 @@
   padding: 0.5rem;
 }
 .p-datepicker .p-timepicker button {
-  width: 2.5rem;
-  height: 2.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
   background: transparent;
   border-radius: 50%;
-  transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datepicker .p-timepicker button:hover {
+.p-datepicker .p-timepicker button:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
 }
+.p-datepicker .p-timepicker button:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #E1BEE7;
+}
 .p-datepicker .p-timepicker button:last-child {
   margin-top: 0.2em;
 }
@@ -287,10 +300,6 @@
   padding-right: 0;
   border-right: 0 none;
 }
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-prev:hover,
-.p-datepicker:not(.p-disabled) .p-datepicker-header .p-datepicker-next:hover {
-  color: rgba(255, 255, 255, 0.87);
-}
 .p-datepicker:not(.p-disabled) table td span:not(.p-highlight):not(.p-disabled):hover {
   background: rgba(255, 255, 255, 0.03);
 }
@@ -904,13 +913,17 @@
   background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin-left: 0.5rem;
 }
-.p-multiselect-panel .p-multiselect-header .p-multiselect-close:hover {
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
 }
+.p-multiselect-panel .p-multiselect-header .p-multiselect-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #E1BEE7;
+}
 .p-multiselect-panel .p-multiselect-items {
   padding: 0.5rem 0;
 }
@@ -1612,20 +1625,26 @@
 
 .p-carousel .p-carousel-content .p-carousel-prev,
 .p-carousel .p-carousel-content .p-carousel-next {
-  background: transparent;
-  border: 0 none;
-  color: rgba(255, 255, 255, 0.6);
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-  margin: 0.5rem;
+  margin: 0 0.5rem;
 }
-.p-carousel .p-carousel-content .p-carousel-prev:not(.p-disabled):hover,
-.p-carousel .p-carousel-content .p-carousel-next:not(.p-disabled):hover {
-  background: rgba(255, 255, 255, 0.03);
-  border-color: transparent;
+.p-carousel .p-carousel-content .p-carousel-prev:enabled:hover,
+.p-carousel .p-carousel-content .p-carousel-next:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-carousel .p-carousel-content .p-carousel-prev:focus,
+.p-carousel .p-carousel-content .p-carousel-next:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #E1BEE7;
 }
 .p-carousel .p-carousel-indicators {
   padding: 1rem;
@@ -1734,23 +1753,41 @@
   border-width: 0 0 1px 0;
   padding: 1rem 1rem;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel {
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:hover {
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:enabled:hover,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-toggler:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-init:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save:focus,
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-cancel:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #E1BEE7;
+}
+.p-datatable .p-datatable-tbody > tr > td .p-row-editor-save {
+  margin-right: 0.5rem;
 }
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: #BA68C8;
   color: #ffffff;
 }
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler {
-  color: #ffffff;
-}
-.p-datatable .p-datatable-tbody > tr.p-highlight .p-row-toggler:hover {
-  color: #ffffff;
-}
 .p-datatable .p-datatable-tbody > tr.p-datatable-dragpoint-top > td {
   box-shadow: inset 0 2px 0 0 #BA68C8;
 }
@@ -2064,20 +2101,15 @@
   padding: 1rem;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler {
-  bottom: -0.7em;
-  margin-left: -0.46em;
-  color: rgba(255, 255, 255, 0.6);
-  border-radius: 3px;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  background: inherit;
+  color: inherit;
+  border-radius: 50%;
 }
 .p-organizationchart .p-organizationchart-node-content .p-node-toggler:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 1px #E1BEE7;
 }
-.p-organizationchart .p-organizationchart-node-content .p-node-toggler:hover {
-  color: rgba(255, 255, 255, 0.87);
-}
 
 .p-paginator {
   background: #1f2d40;
@@ -2244,11 +2276,23 @@
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler {
   margin-right: 0.5rem;
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:hover {
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-tree .p-tree-container .p-treenode .p-treenode-content .p-tree-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #E1BEE7;
 }
 .p-tree .p-tree-container .p-treenode .p-treenode-content .p-treenode-icon {
   margin-right: 0.5rem;
@@ -2381,12 +2425,24 @@
   padding: 1rem 1rem;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler {
+  width: 2rem;
+  height: 2rem;
   color: rgba(255, 255, 255, 0.6);
-  margin-right: 0.5rem;
+  border: 0 none;
+  background: transparent;
+  border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  margin-right: 0.5rem;
 }
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:hover {
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #E1BEE7;
 }
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler + .p-checkbox {
   margin-right: 0.5rem;
@@ -2581,7 +2637,7 @@
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend {
   padding: 0;
-  transition: box-shadow 0.2s;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-fieldset.p-fieldset-toggleable .p-fieldset-legend a {
   padding: 1rem;
@@ -2618,12 +2674,12 @@
   width: 2rem;
   height: 2rem;
   color: rgba(255, 255, 255, 0.6);
-  background: transparent;
   border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-panel .p-panel-header .p-panel-header-icon:hover {
+.p-panel .p-panel-header .p-panel-header-icon:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
@@ -2740,7 +2796,7 @@
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
   border-color: transparent;
   background: rgba(255, 255, 255, 0.03);
@@ -2788,19 +2844,17 @@
 }
 .p-overlaypanel .p-overlaypanel-close {
   background: #BA68C8;
-  border: 0 none;
   color: #ffffff;
   width: 2rem;
   height: 2rem;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+  border-radius: 50%;
   position: absolute;
   top: -1rem;
   right: -1rem;
-  border-radius: 50%;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-overlaypanel .p-overlaypanel-close:hover {
-  background: #9C27B0;
-  border-color: transparent;
+.p-overlaypanel .p-overlaypanel-close:enabled:hover {
+  background: #AB47BC;
   color: #ffffff;
 }
 .p-overlaypanel:after {
@@ -2828,18 +2882,23 @@
   box-shadow: 0px 11px 15px -7px rgba(0, 0, 0, 0.2), 0px 24px 38px 3px rgba(0, 0, 0, 0.14), 0px 9px 46px 8px rgba(0, 0, 0, 0.12);
 }
 .p-sidebar .p-sidebar-close {
-  background: transparent;
-  border: 0 none;
-  color: rgba(255, 255, 255, 0.6);
   width: 2rem;
   height: 2rem;
+  color: rgba(255, 255, 255, 0.6);
+  border: 0 none;
+  background: transparent;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
-.p-sidebar .p-sidebar-close:hover {
-  background: rgba(255, 255, 255, 0.03);
-  border-color: transparent;
+.p-sidebar .p-sidebar-close:enabled:hover {
   color: rgba(255, 255, 255, 0.87);
+  border-color: transparent;
+  background: rgba(255, 255, 255, 0.03);
+}
+.p-sidebar .p-sidebar-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #E1BEE7;
 }
 
 .p-sidebar-mask.p-component-overlay {
@@ -3318,21 +3377,15 @@
   }
   .p-menubar .p-menubar-button {
     display: flex;
+    width: 2rem;
+    height: 2rem;
     color: rgba(255, 255, 255, 0.6);
-    background: transparent;
-    border: 0 none;
-    width: 2.5rem;
-    height: 2.5rem;
     border-radius: 50%;
     transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
   }
-  .p-menubar .p-menubar-button i {
-    font-size: 1.5rem;
-  }
   .p-menubar .p-menubar-button:hover {
     color: rgba(255, 255, 255, 0.87);
     background: rgba(255, 255, 255, 0.03);
-    border-color: transparent;
   }
   .p-menubar .p-menubar-button:focus {
     outline: 0 none;
@@ -3767,6 +3820,21 @@
 .p-message .p-message-wrapper {
   padding: 1rem 1.5rem;
 }
+.p-message .p-message-close {
+  width: 2rem;
+  height: 2rem;
+  border-radius: 50%;
+  background: transparent;
+  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
+}
+.p-message .p-message-close:hover {
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-message .p-message-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #E1BEE7;
+}
 .p-message.p-message-info {
   background: #B3E5FC;
   border: solid #03A9F4;
@@ -3777,7 +3845,6 @@
   color: #01579B;
 }
 .p-message.p-message-info .p-message-close {
-  background: #B3E5FC;
   color: #01579B;
 }
 .p-message.p-message-success {
@@ -3790,7 +3857,6 @@
   color: #1B5E20;
 }
 .p-message.p-message-success .p-message-close {
-  background: #C8E6C9;
   color: #1B5E20;
 }
 .p-message.p-message-warn {
@@ -3803,7 +3869,6 @@
   color: #7f6003;
 }
 .p-message.p-message-warn .p-message-close {
-  background: #FFECB3;
   color: #7f6003;
 }
 .p-message.p-message-error {
@@ -3816,23 +3881,8 @@
   color: #B71C1C;
 }
 .p-message.p-message-error .p-message-close {
-  background: #FFCDD2;
   color: #B71C1C;
 }
-.p-message .p-message-close {
-  border-radius: 50%;
-  width: 2rem;
-  height: 2rem;
-  transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
-}
-.p-message .p-message-close:hover {
-  background: rgba(255, 255, 255, 0.5);
-}
-.p-message .p-message-close:focus {
-  outline: 0 none;
-  outline-offset: 0;
-  box-shadow: 0 0 0 1px #E1BEE7;
-}
 .p-message .p-message-text {
   font-size: 1rem;
   font-weight: 500;
@@ -3867,13 +3917,19 @@
   margin: 0.5rem 0 0 0;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close {
-  border-radius: 50%;
   width: 2rem;
   height: 2rem;
+  border-radius: 50%;
+  background: transparent;
   transition: background-color 0.2s, color 0.2s, box-shadow 0.2s;
 }
 .p-toast .p-toast-item-container .p-toast-icon-close:hover {
-  background: rgba(255, 255, 255, 0.2);
+  background: rgba(255, 255, 255, 0.3);
+}
+.p-toast .p-toast-item-container .p-toast-icon-close:focus {
+  outline: 0 none;
+  outline-offset: 0;
+  box-shadow: 0 0 0 1px #E1BEE7;
 }
 .p-toast .p-toast-item-container.p-toast-message-info {
   background: #B3E5FC;
diff --git a/src/assets/styles/app/_core.scss b/src/assets/styles/app/_core.scss
index 25c2c362a..1250f426c 100644
--- a/src/assets/styles/app/_core.scss
+++ b/src/assets/styles/app/_core.scss
@@ -45,7 +45,7 @@ a {
 }
 
 .layout-mask {
-    opacity: .1;
+    background-color: rgba(0, 0, 0, 0.1);
 }
 
 .layout-mask-active {
@@ -55,9 +55,8 @@ a {
     position: fixed;
     top: 70px;
     left: 0;
-    background-color: #4c5254;
-    opacity: .7;
-    transition: opacity .5s;
+    background-color: rgba(0, 0, 0, 0.4);
+    transition: background-color .5s;
 }
 
 .clearfix {
diff --git a/src/components/datatable/DataTable.vue b/src/components/datatable/DataTable.vue
index 972357dc9..745ab5523 100755
--- a/src/components/datatable/DataTable.vue
+++ b/src/components/datatable/DataTable.vue
@@ -1966,6 +1966,21 @@ export default {
     width: 100%;
 }
 
+.p-datatable .p-row-editor-init,
+.p-datatable .p-row-editor-save,
+.p-datatable .p-row-editor-cancel {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+}
+
+/* Expand */
+.p-datatable .p-row-toggler {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+}
+
 /* Reorder */
 .p-datatable-reorder-indicator-up,
 .p-datatable-reorder-indicator-down {
diff --git a/src/components/organizationchart/OrganizationChart.vue b/src/components/organizationchart/OrganizationChart.vue
index 33419a972..b8b476929 100755
--- a/src/components/organizationchart/OrganizationChart.vue
+++ b/src/components/organizationchart/OrganizationChart.vue
@@ -107,12 +107,19 @@ export default {
 
 .p-organizationchart-node-content .p-node-toggler {
     position: absolute;
-    bottom: -9px;
-    margin-left: -8px;
+    bottom: -.75rem;
+    margin-left: -.75rem;
     z-index: 2;
     left: 50%;
     user-select: none;
     cursor: pointer;
+    width: 1.5rem;
+    height: 1.5rem;
+}
+
+.p-organizationchart-node-content .p-node-toggler .p-node-toggler-icon {
+    position: relative;
+    top: .25rem;
 }
 
 .p-organizationchart-line-down {
diff --git a/src/components/tree/Tree.vue b/src/components/tree/Tree.vue
index df024b8f0..87ab34222 100755
--- a/src/components/tree/Tree.vue
+++ b/src/components/tree/Tree.vue
@@ -300,6 +300,9 @@ export default {
 .p-tree-toggler {
     cursor: pointer;
     user-select: none;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
 }
 
 .p-treenode-leaf > .p-treenode-content .p-tree-toggler {
diff --git a/src/components/tree/TreeNode.vue b/src/components/tree/TreeNode.vue
index a4473a60f..ecdf7de1a 100755
--- a/src/components/tree/TreeNode.vue
+++ b/src/components/tree/TreeNode.vue
@@ -2,9 +2,9 @@
     <li :class="containerClass">
         <div :class="contentClass" tabindex="0" role="treeitem" :aria-expanded="expanded"
             @click="onClick" @keydown="onKeyDown" @touchend="onTouchEnd" :style="node.style">
-            <span class="p-tree-toggler" @click="toggle">
+            <button class="p-tree-toggler p-link" @click="toggle" tabindex="-1">
                 <span :class="toggleIcon"></span>
-            </span>
+            </button>
             <div class="p-checkbox p-component" v-if="checkboxMode">
                 <div :class="checkboxClass" role="checkbox" :aria-checked="checked">
                     <span :class="checkboxIcon"></span>
@@ -289,8 +289,8 @@ export default {
         },
         toggleIcon() {
             return ['p-tree-toggler-icon pi pi-fw', {
-                'pi-angle-down': this.expanded,
-                'pi-angle-right': !this.expanded
+                'pi-chevron-down': this.expanded,
+                'pi-chevron-right': !this.expanded
             }];
         },
         checkboxClass() {
diff --git a/src/components/treetable/TreeTable.vue b/src/components/treetable/TreeTable.vue
index 64e886dd4..6418b4353 100755
--- a/src/components/treetable/TreeTable.vue
+++ b/src/components/treetable/TreeTable.vue
@@ -928,6 +928,18 @@ export default {
 .p-treetable-toggler {
     cursor: pointer;
     user-select: none;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    vertical-align: middle;
+}
+
+.p-treetable-toggler + .p-checkbox {
+    vertical-align: middle;
+}
+
+.p-treetable-toggler + .p-checkbox + span {
+    vertical-align: middle;
 }
 
 /* Resizable */
diff --git a/src/components/treetable/TreeTableRow.vue b/src/components/treetable/TreeTableRow.vue
index 42105ab5d..87ba180ab 100755
--- a/src/components/treetable/TreeTableRow.vue
+++ b/src/components/treetable/TreeTableRow.vue
@@ -1,9 +1,9 @@
 <template>
     <tr :class="containerClass" @click="onClick" @keydown="onKeyDown" @touchend="onTouchEnd" :style="node.style" tabindex="0">
         <td v-for="(col,i) of columns" :key="col.columnKey||col.field||i" :style="col.bodyStyle" :class="col.bodyClass">
-            <span class="p-treetable-toggler" @click="toggle" v-if="col.expander" :style="togglerStyle">
+            <button class="p-treetable-toggler p-link" @click="toggle" v-if="col.expander" :style="togglerStyle" tabindex="-1">
                 <i :class="togglerIcon"></i>
-            </span>
+            </button>
             <div class="p-checkbox p-treetable-checkbox p-component" @click="toggleCheckbox" v-if="checkboxSelectionMode && col.expander" role="checkbox" :aria-checked="checked">
                 <div class="p-hidden-accessible">
                     <input type="checkbox" @focus="onCheckboxFocus" @blur="onCheckboxBlur" />
@@ -13,7 +13,7 @@
                 </div>
             </div>
             <TTColumnSlot :node="node" :column="col" type="body" v-if="col.$scopedSlots.body" />
-            <template>{{resolveFieldData(node.data, col.field)}}</template>
+            <template><span>{{resolveFieldData(node.data, col.field)}}</span></template>
         </td>
     </tr>
 </template>
@@ -218,7 +218,7 @@ export default {
             return (this.selectionMode && this.selectionKeys) ? this.selectionKeys[this.node.key] === true : false;
         },
         togglerIcon() {
-            return ['p-treetable-toggler-icon pi', {'pi-angle-right': !this.expanded, 'pi-angle-down': this.expanded}];
+            return ['p-treetable-toggler-icon pi', {'pi-chevron-right': !this.expanded, 'pi-chevron-down': this.expanded}];
         },
         togglerStyle() {
             return {
diff --git a/src/views/datatable/DataTableDoc.vue b/src/views/datatable/DataTableDoc.vue
index 6dce1060d..319a5d7e8 100755
--- a/src/views/datatable/DataTableDoc.vue
+++ b/src/views/datatable/DataTableDoc.vue
@@ -1129,7 +1129,7 @@ export default {
             &lt;InputText v-model="slotProps.data[slotProps.column.field]" /&gt;
         &lt;/template&gt;
     &lt;/Column&gt;
-    &lt;Column :rowEditor="true" headerStyle="width:6em" bodyStyle="text-align:center"&gt;&lt;/Column&gt;
+    &lt;Column :rowEditor="true" headerStyle="width:7rem" bodyStyle="text-align:center"&gt;&lt;/Column&gt;
 &lt;/DataTable&gt;
 </template>
 </CodeHighlight>
diff --git a/src/views/datatable/DataTableEditDemo.vue b/src/views/datatable/DataTableEditDemo.vue
index 6b9180f58..514c04057 100755
--- a/src/views/datatable/DataTableEditDemo.vue
+++ b/src/views/datatable/DataTableEditDemo.vue
@@ -76,7 +76,7 @@
                             <InputText v-model="slotProps.data[slotProps.column.field]" />
                         </template>
                     </Column>
-                    <Column :rowEditor="true" headerStyle="width:6em" bodyStyle="text-align:center"></Column>
+                    <Column :rowEditor="true" headerStyle="width:7rem" bodyStyle="text-align:center"></Column>
                 </DataTable>
             </div>
 		</div>
@@ -147,7 +147,7 @@
             &lt;InputText v-model="slotProps.data[slotProps.column.field]" /&gt;
         &lt;/template&gt;
     &lt;/Column&gt;
-    &lt;Column :rowEditor="true" headerStyle="width:6em" bodyStyle="text-align:center"&gt;&lt;/Column&gt;
+    &lt;Column :rowEditor="true" headerStyle="width:7rem" bodyStyle="text-align:center"&gt;&lt;/Column&gt;
 &lt;/DataTable&gt;
 </template>
 </CodeHighlight>
diff --git a/src/views/organizationchart/OrganizationChartDemo.vue b/src/views/organizationchart/OrganizationChartDemo.vue
index e50293898..333eeffc2 100755
--- a/src/views/organizationchart/OrganizationChartDemo.vue
+++ b/src/views/organizationchart/OrganizationChartDemo.vue
@@ -220,13 +220,5 @@ export default {
         background-color: #e9286f;
         color: #ffffff;
     }
-
-    .p-person .p-node-toggler {
-        color: #495ebb !important;
-    }
-
-    .department-cto .p-node-toggler {
-        color: #8a0a39 !important;
-    }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/organizationchart/OrganizationChartDoc.vue b/src/views/organizationchart/OrganizationChartDoc.vue
index 7d9c17cb8..01b13ec2b 100755
--- a/src/views/organizationchart/OrganizationChartDoc.vue
+++ b/src/views/organizationchart/OrganizationChartDoc.vue
@@ -686,14 +686,6 @@ export default {
         background-color: #e9286f;
         color: #ffffff;
     }
-
-    .p-person .p-node-toggler {
-        color: #495ebb !important;
-    }
-
-    .department-cto .p-node-toggler {
-        color: #8a0a39 !important;
-    }
 }
 </CodeHighlight>
 			</TabPanel>