From 9055150fe43c48fb9f57c79a4d3c2301d68ae981 Mon Sep 17 00:00:00 2001
From: cagataycivici <cagatay.civici@gmail.com>
Date: Sat, 9 May 2020 18:13:26 +0300
Subject: [PATCH] Use rems for checkbox and radio

---
 public/themes/luna-amber/theme.css      |  51 ++++++-----
 public/themes/luna-green/theme.css      |  51 ++++++-----
 public/themes/luna-pink/theme.css       |  51 ++++++-----
 public/themes/nova-colored/theme.css    |  51 ++++++-----
 public/themes/nova-dark/theme.css       |  51 ++++++-----
 public/themes/nova-light/theme.css      |  51 ++++++-----
 public/themes/nova-vue/theme.css        |  51 ++++++-----
 public/themes/rhea/theme.css            |  51 ++++++-----
 public/themes/saga-blue/theme.css       | 107 +++++++++++++-----------
 public/themes/saga-cyan/theme.css       | 107 +++++++++++++-----------
 public/themes/saga-deeppurple/theme.css | 107 +++++++++++++-----------
 public/themes/saga-green/theme.css      | 107 +++++++++++++-----------
 public/themes/saga-indigo/theme.css     | 107 +++++++++++++-----------
 public/themes/saga-orange/theme.css     | 107 +++++++++++++-----------
 public/themes/saga-purple/theme.css     | 107 +++++++++++++-----------
 public/themes/saga-teal/theme.css       | 107 +++++++++++++-----------
 public/themes/vela-blue/theme.css       | 103 ++++++++++++-----------
 public/themes/vela-cyan/theme.css       | 103 ++++++++++++-----------
 public/themes/vela-deeppurple/theme.css | 103 ++++++++++++-----------
 public/themes/vela-green/theme.css      | 103 ++++++++++++-----------
 public/themes/vela-indigo/theme.css     | 103 ++++++++++++-----------
 public/themes/vela-orange/theme.css     | 103 ++++++++++++-----------
 public/themes/vela-purple/theme.css     | 103 ++++++++++++-----------
 public/themes/vela-teal/theme.css       | 103 ++++++++++++-----------
 24 files changed, 1128 insertions(+), 960 deletions(-)

diff --git a/public/themes/luna-amber/theme.css b/public/themes/luna-amber/theme.css
index 6f64d27e6..a8612fdff 100644
--- a/public/themes/luna-amber/theme.css
+++ b/public/themes/luna-amber/theme.css
@@ -296,14 +296,14 @@
 }
 
 .p-checkbox {
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
 }
 .p-checkbox .p-checkbox-box {
   border: 1px solid #585858;
   background: #585858;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #dedede;
   border-radius: 3px;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -848,8 +848,8 @@
 .p-radiobutton .p-radiobutton-box {
   border: 1px solid #585858;
   background: #585858;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #dedede;
   border-radius: 50%;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -864,13 +864,17 @@
   border-color: #FFB300;
 }
 .p-radiobutton .p-radiobutton-box .p-radiobutton-icon {
-  font-size: 0.75rem;
+  width: 0.75rem;
+  height: 0.75rem;
   transition-duration: 0.2s;
+  border-radius: 50%;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight {
   border-color: #FFB300;
   background: #FFB300;
-  color: #212121;
+}
+.p-radiobutton .p-radiobutton-box.p-highlight .p-radiobutton-icon {
+  background-color: #212121;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight:not(.p-disabled):hover {
   border-color: #FF8F00;
@@ -1065,6 +1069,12 @@
 .p-button .p-badge {
   margin-left: 0.5rem;
 }
+.p-button.p-button-raised {
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
+}
+.p-button.p-button-rounded {
+  border-radius: 1rem;
+}
 .p-button.p-button-icon-only {
   width: 2.357rem;
 }
@@ -1072,11 +1082,8 @@
 .p-button.p-button-icon-only .p-button-icon-right {
   margin: 0;
 }
-.p-button.p-button-raised {
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
-}
-.p-button.p-button-rounded {
-  border-radius: 15px;
+.p-button.p-button-icon-only.p-button-rounded {
+  border-radius: 50%;
 }
 
 .p-fluid .p-button {
@@ -1299,9 +1306,9 @@
 }
 .p-datatable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #FFB300;
   background: #212121;
   margin-left: 0.5rem;
@@ -1866,9 +1873,9 @@
 }
 .p-treetable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #FFB300;
   background: #212121;
   margin-left: 0.5rem;
@@ -2320,7 +2327,7 @@
   border-bottom-left-radius: 3px;
 }
 .p-fileupload .p-progressbar {
-  height: 4px;
+  height: 0.25rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
@@ -2433,7 +2440,7 @@
   border-radius: 3px;
 }
 .p-megamenu .p-megamenu-root-list .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-megamenu .p-menuitem-link {
@@ -2575,7 +2582,7 @@
   border-radius: 3px;
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-menubar .p-menuitem-link {
diff --git a/public/themes/luna-green/theme.css b/public/themes/luna-green/theme.css
index 350752cbe..91a687410 100644
--- a/public/themes/luna-green/theme.css
+++ b/public/themes/luna-green/theme.css
@@ -296,14 +296,14 @@
 }
 
 .p-checkbox {
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
 }
 .p-checkbox .p-checkbox-box {
   border: 1px solid #585858;
   background: #585858;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #dedede;
   border-radius: 3px;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -848,8 +848,8 @@
 .p-radiobutton .p-radiobutton-box {
   border: 1px solid #585858;
   background: #585858;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #dedede;
   border-radius: 50%;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -864,13 +864,17 @@
   border-color: #1ea04c;
 }
 .p-radiobutton .p-radiobutton-box .p-radiobutton-icon {
-  font-size: 0.75rem;
+  width: 0.75rem;
+  height: 0.75rem;
   transition-duration: 0.2s;
+  border-radius: 50%;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight {
   border-color: #1ea04c;
   background: #1ea04c;
-  color: #ffffff;
+}
+.p-radiobutton .p-radiobutton-box.p-highlight .p-radiobutton-icon {
+  background-color: #ffffff;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight:not(.p-disabled):hover {
   border-color: #18803c;
@@ -1065,6 +1069,12 @@
 .p-button .p-badge {
   margin-left: 0.5rem;
 }
+.p-button.p-button-raised {
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
+}
+.p-button.p-button-rounded {
+  border-radius: 1rem;
+}
 .p-button.p-button-icon-only {
   width: 2.357rem;
 }
@@ -1072,11 +1082,8 @@
 .p-button.p-button-icon-only .p-button-icon-right {
   margin: 0;
 }
-.p-button.p-button-raised {
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
-}
-.p-button.p-button-rounded {
-  border-radius: 15px;
+.p-button.p-button-icon-only.p-button-rounded {
+  border-radius: 50%;
 }
 
 .p-fluid .p-button {
@@ -1299,9 +1306,9 @@
 }
 .p-datatable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #1ea04c;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -1866,9 +1873,9 @@
 }
 .p-treetable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #1ea04c;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -2320,7 +2327,7 @@
   border-bottom-left-radius: 3px;
 }
 .p-fileupload .p-progressbar {
-  height: 4px;
+  height: 0.25rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
@@ -2433,7 +2440,7 @@
   border-radius: 3px;
 }
 .p-megamenu .p-megamenu-root-list .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-megamenu .p-menuitem-link {
@@ -2575,7 +2582,7 @@
   border-radius: 3px;
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-menubar .p-menuitem-link {
diff --git a/public/themes/luna-pink/theme.css b/public/themes/luna-pink/theme.css
index a1954b53c..659b6f545 100644
--- a/public/themes/luna-pink/theme.css
+++ b/public/themes/luna-pink/theme.css
@@ -296,14 +296,14 @@
 }
 
 .p-checkbox {
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
 }
 .p-checkbox .p-checkbox-box {
   border: 1px solid #585858;
   background: #585858;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #dedede;
   border-radius: 3px;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -848,8 +848,8 @@
 .p-radiobutton .p-radiobutton-box {
   border: 1px solid #585858;
   background: #585858;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #dedede;
   border-radius: 50%;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -864,13 +864,17 @@
   border-color: #cc285c;
 }
 .p-radiobutton .p-radiobutton-box .p-radiobutton-icon {
-  font-size: 0.75rem;
+  width: 0.75rem;
+  height: 0.75rem;
   transition-duration: 0.2s;
+  border-radius: 50%;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight {
   border-color: #cc285c;
   background: #cc285c;
-  color: #ffffff;
+}
+.p-radiobutton .p-radiobutton-box.p-highlight .p-radiobutton-icon {
+  background-color: #ffffff;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight:not(.p-disabled):hover {
   border-color: #a32049;
@@ -1065,6 +1069,12 @@
 .p-button .p-badge {
   margin-left: 0.5rem;
 }
+.p-button.p-button-raised {
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
+}
+.p-button.p-button-rounded {
+  border-radius: 1rem;
+}
 .p-button.p-button-icon-only {
   width: 2.357rem;
 }
@@ -1072,11 +1082,8 @@
 .p-button.p-button-icon-only .p-button-icon-right {
   margin: 0;
 }
-.p-button.p-button-raised {
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
-}
-.p-button.p-button-rounded {
-  border-radius: 15px;
+.p-button.p-button-icon-only.p-button-rounded {
+  border-radius: 50%;
 }
 
 .p-fluid .p-button {
@@ -1299,9 +1306,9 @@
 }
 .p-datatable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #cc285c;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -1866,9 +1873,9 @@
 }
 .p-treetable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #cc285c;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -2320,7 +2327,7 @@
   border-bottom-left-radius: 3px;
 }
 .p-fileupload .p-progressbar {
-  height: 4px;
+  height: 0.25rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
@@ -2433,7 +2440,7 @@
   border-radius: 3px;
 }
 .p-megamenu .p-megamenu-root-list .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-megamenu .p-menuitem-link {
@@ -2575,7 +2582,7 @@
   border-radius: 3px;
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-menubar .p-menuitem-link {
diff --git a/public/themes/nova-colored/theme.css b/public/themes/nova-colored/theme.css
index 5175511d3..088fa8130 100644
--- a/public/themes/nova-colored/theme.css
+++ b/public/themes/nova-colored/theme.css
@@ -296,14 +296,14 @@
 }
 
 .p-checkbox {
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
 }
 .p-checkbox .p-checkbox-box {
   border: 1px solid #a6a6a6;
   background: #ffffff;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #333333;
   border-radius: 3px;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -848,8 +848,8 @@
 .p-radiobutton .p-radiobutton-box {
   border: 1px solid #a6a6a6;
   background: #ffffff;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #333333;
   border-radius: 50%;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -864,13 +864,17 @@
   border-color: #007ad9;
 }
 .p-radiobutton .p-radiobutton-box .p-radiobutton-icon {
-  font-size: 0.75rem;
+  width: 0.75rem;
+  height: 0.75rem;
   transition-duration: 0.2s;
+  border-radius: 50%;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight {
   border-color: #007ad9;
   background: #007ad9;
-  color: #ffffff;
+}
+.p-radiobutton .p-radiobutton-box.p-highlight .p-radiobutton-icon {
+  background-color: #ffffff;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight:not(.p-disabled):hover {
   border-color: #005b9f;
@@ -1065,6 +1069,12 @@
 .p-button .p-badge {
   margin-left: 0.5rem;
 }
+.p-button.p-button-raised {
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
+}
+.p-button.p-button-rounded {
+  border-radius: 1rem;
+}
 .p-button.p-button-icon-only {
   width: 2.357rem;
 }
@@ -1072,11 +1082,8 @@
 .p-button.p-button-icon-only .p-button-icon-right {
   margin: 0;
 }
-.p-button.p-button-raised {
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
-}
-.p-button.p-button-rounded {
-  border-radius: 15px;
+.p-button.p-button-icon-only.p-button-rounded {
+  border-radius: 50%;
 }
 
 .p-fluid .p-button {
@@ -1299,9 +1306,9 @@
 }
 .p-datatable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #e02365;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -1866,9 +1873,9 @@
 }
 .p-treetable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #e02365;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -2320,7 +2327,7 @@
   border-bottom-left-radius: 3px;
 }
 .p-fileupload .p-progressbar {
-  height: 4px;
+  height: 0.25rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
@@ -2433,7 +2440,7 @@
   border-radius: 3px;
 }
 .p-megamenu .p-megamenu-root-list .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-megamenu .p-menuitem-link {
@@ -2575,7 +2582,7 @@
   border-radius: 3px;
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-menubar .p-menuitem-link {
diff --git a/public/themes/nova-dark/theme.css b/public/themes/nova-dark/theme.css
index c84c85d06..490d87ef3 100644
--- a/public/themes/nova-dark/theme.css
+++ b/public/themes/nova-dark/theme.css
@@ -296,14 +296,14 @@
 }
 
 .p-checkbox {
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
 }
 .p-checkbox .p-checkbox-box {
   border: 1px solid #a6a6a6;
   background: #ffffff;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #333333;
   border-radius: 3px;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -848,8 +848,8 @@
 .p-radiobutton .p-radiobutton-box {
   border: 1px solid #a6a6a6;
   background: #ffffff;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #333333;
   border-radius: 50%;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -864,13 +864,17 @@
   border-color: #007ad9;
 }
 .p-radiobutton .p-radiobutton-box .p-radiobutton-icon {
-  font-size: 0.75rem;
+  width: 0.75rem;
+  height: 0.75rem;
   transition-duration: 0.2s;
+  border-radius: 50%;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight {
   border-color: #007ad9;
   background: #007ad9;
-  color: #ffffff;
+}
+.p-radiobutton .p-radiobutton-box.p-highlight .p-radiobutton-icon {
+  background-color: #ffffff;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight:not(.p-disabled):hover {
   border-color: #005b9f;
@@ -1065,6 +1069,12 @@
 .p-button .p-badge {
   margin-left: 0.5rem;
 }
+.p-button.p-button-raised {
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
+}
+.p-button.p-button-rounded {
+  border-radius: 1rem;
+}
 .p-button.p-button-icon-only {
   width: 2.357rem;
 }
@@ -1072,11 +1082,8 @@
 .p-button.p-button-icon-only .p-button-icon-right {
   margin: 0;
 }
-.p-button.p-button-raised {
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
-}
-.p-button.p-button-rounded {
-  border-radius: 15px;
+.p-button.p-button-icon-only.p-button-rounded {
+  border-radius: 50%;
 }
 
 .p-fluid .p-button {
@@ -1299,9 +1306,9 @@
 }
 .p-datatable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #007ad9;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -1866,9 +1873,9 @@
 }
 .p-treetable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #007ad9;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -2320,7 +2327,7 @@
   border-bottom-left-radius: 3px;
 }
 .p-fileupload .p-progressbar {
-  height: 4px;
+  height: 0.25rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
@@ -2433,7 +2440,7 @@
   border-radius: 3px;
 }
 .p-megamenu .p-megamenu-root-list .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-megamenu .p-menuitem-link {
@@ -2575,7 +2582,7 @@
   border-radius: 3px;
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-menubar .p-menuitem-link {
diff --git a/public/themes/nova-light/theme.css b/public/themes/nova-light/theme.css
index ee7106b0f..b14f35a7d 100644
--- a/public/themes/nova-light/theme.css
+++ b/public/themes/nova-light/theme.css
@@ -296,14 +296,14 @@
 }
 
 .p-checkbox {
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
 }
 .p-checkbox .p-checkbox-box {
   border: 1px solid #a6a6a6;
   background: #ffffff;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #333333;
   border-radius: 3px;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -848,8 +848,8 @@
 .p-radiobutton .p-radiobutton-box {
   border: 1px solid #a6a6a6;
   background: #ffffff;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #333333;
   border-radius: 50%;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -864,13 +864,17 @@
   border-color: #007ad9;
 }
 .p-radiobutton .p-radiobutton-box .p-radiobutton-icon {
-  font-size: 0.75rem;
+  width: 0.75rem;
+  height: 0.75rem;
   transition-duration: 0.2s;
+  border-radius: 50%;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight {
   border-color: #007ad9;
   background: #007ad9;
-  color: #ffffff;
+}
+.p-radiobutton .p-radiobutton-box.p-highlight .p-radiobutton-icon {
+  background-color: #ffffff;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight:not(.p-disabled):hover {
   border-color: #005b9f;
@@ -1065,6 +1069,12 @@
 .p-button .p-badge {
   margin-left: 0.5rem;
 }
+.p-button.p-button-raised {
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
+}
+.p-button.p-button-rounded {
+  border-radius: 1rem;
+}
 .p-button.p-button-icon-only {
   width: 2.357rem;
 }
@@ -1072,11 +1082,8 @@
 .p-button.p-button-icon-only .p-button-icon-right {
   margin: 0;
 }
-.p-button.p-button-raised {
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
-}
-.p-button.p-button-rounded {
-  border-radius: 15px;
+.p-button.p-button-icon-only.p-button-rounded {
+  border-radius: 50%;
 }
 
 .p-fluid .p-button {
@@ -1299,9 +1306,9 @@
 }
 .p-datatable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #007ad9;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -1866,9 +1873,9 @@
 }
 .p-treetable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #007ad9;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -2320,7 +2327,7 @@
   border-bottom-left-radius: 3px;
 }
 .p-fileupload .p-progressbar {
-  height: 4px;
+  height: 0.25rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
@@ -2433,7 +2440,7 @@
   border-radius: 3px;
 }
 .p-megamenu .p-megamenu-root-list .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-megamenu .p-menuitem-link {
@@ -2575,7 +2582,7 @@
   border-radius: 3px;
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-menubar .p-menuitem-link {
diff --git a/public/themes/nova-vue/theme.css b/public/themes/nova-vue/theme.css
index 17337c09a..c85b64ac9 100644
--- a/public/themes/nova-vue/theme.css
+++ b/public/themes/nova-vue/theme.css
@@ -296,14 +296,14 @@
 }
 
 .p-checkbox {
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
 }
 .p-checkbox .p-checkbox-box {
   border: 1px solid #a6a6a6;
   background: #ffffff;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #333333;
   border-radius: 3px;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -848,8 +848,8 @@
 .p-radiobutton .p-radiobutton-box {
   border: 1px solid #a6a6a6;
   background: #ffffff;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #333333;
   border-radius: 50%;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -864,13 +864,17 @@
   border-color: #41b883;
 }
 .p-radiobutton .p-radiobutton-box .p-radiobutton-icon {
-  font-size: 0.75rem;
+  width: 0.75rem;
+  height: 0.75rem;
   transition-duration: 0.2s;
+  border-radius: 50%;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight {
   border-color: #41b883;
   background: #41b883;
-  color: #ffffff;
+}
+.p-radiobutton .p-radiobutton-box.p-highlight .p-radiobutton-icon {
+  background-color: #ffffff;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight:not(.p-disabled):hover {
   border-color: #246749;
@@ -1065,6 +1069,12 @@
 .p-button .p-badge {
   margin-left: 0.5rem;
 }
+.p-button.p-button-raised {
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
+}
+.p-button.p-button-rounded {
+  border-radius: 1rem;
+}
 .p-button.p-button-icon-only {
   width: 2.357rem;
 }
@@ -1072,11 +1082,8 @@
 .p-button.p-button-icon-only .p-button-icon-right {
   margin: 0;
 }
-.p-button.p-button-raised {
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
-}
-.p-button.p-button-rounded {
-  border-radius: 15px;
+.p-button.p-button-icon-only.p-button-rounded {
+  border-radius: 50%;
 }
 
 .p-fluid .p-button {
@@ -1299,9 +1306,9 @@
 }
 .p-datatable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #41b883;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -1866,9 +1873,9 @@
 }
 .p-treetable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #41b883;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -2320,7 +2327,7 @@
   border-bottom-left-radius: 3px;
 }
 .p-fileupload .p-progressbar {
-  height: 4px;
+  height: 0.25rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
@@ -2433,7 +2440,7 @@
   border-radius: 3px;
 }
 .p-megamenu .p-megamenu-root-list .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-megamenu .p-menuitem-link {
@@ -2575,7 +2582,7 @@
   border-radius: 3px;
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-menubar .p-menuitem-link {
diff --git a/public/themes/rhea/theme.css b/public/themes/rhea/theme.css
index b4e23dddc..d1c0da9e9 100644
--- a/public/themes/rhea/theme.css
+++ b/public/themes/rhea/theme.css
@@ -296,14 +296,14 @@
 }
 
 .p-checkbox {
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
 }
 .p-checkbox .p-checkbox-box {
   border: 1px solid #dadada;
   background: #f4f4f4;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #666666;
   border-radius: 2px;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -848,8 +848,8 @@
 .p-radiobutton .p-radiobutton-box {
   border: 1px solid #dadada;
   background: #f4f4f4;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #666666;
   border-radius: 50%;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -864,13 +864,17 @@
   border-color: #7B95A3;
 }
 .p-radiobutton .p-radiobutton-box .p-radiobutton-icon {
-  font-size: 0.75rem;
+  width: 0.75rem;
+  height: 0.75rem;
   transition-duration: 0.2s;
+  border-radius: 50%;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight {
   border-color: #7B95A3;
   background: #7B95A3;
-  color: #ffffff;
+}
+.p-radiobutton .p-radiobutton-box.p-highlight .p-radiobutton-icon {
+  background-color: #ffffff;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight:not(.p-disabled):hover {
   border-color: #617c8a;
@@ -1065,6 +1069,12 @@
 .p-button .p-badge {
   margin-left: 0.5rem;
 }
+.p-button.p-button-raised {
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
+}
+.p-button.p-button-rounded {
+  border-radius: 1rem;
+}
 .p-button.p-button-icon-only {
   width: 2.357rem;
 }
@@ -1072,11 +1082,8 @@
 .p-button.p-button-icon-only .p-button-icon-right {
   margin: 0;
 }
-.p-button.p-button-raised {
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
-}
-.p-button.p-button-rounded {
-  border-radius: 15px;
+.p-button.p-button-icon-only.p-button-rounded {
+  border-radius: 50%;
 }
 
 .p-fluid .p-button {
@@ -1299,9 +1306,9 @@
 }
 .p-datatable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #AFD3C8;
   background: #385048;
   margin-left: 0.5rem;
@@ -1866,9 +1873,9 @@
 }
 .p-treetable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #AFD3C8;
   background: #385048;
   margin-left: 0.5rem;
@@ -2320,7 +2327,7 @@
   border-bottom-left-radius: 2px;
 }
 .p-fileupload .p-progressbar {
-  height: 4px;
+  height: 0.25rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
@@ -2433,7 +2440,7 @@
   border-radius: 2px;
 }
 .p-megamenu .p-megamenu-root-list .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-megamenu .p-menuitem-link {
@@ -2575,7 +2582,7 @@
   border-radius: 2px;
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-menubar .p-menuitem-link {
diff --git a/public/themes/saga-blue/theme.css b/public/themes/saga-blue/theme.css
index 28df4c013..86e501af8 100644
--- a/public/themes/saga-blue/theme.css
+++ b/public/themes/saga-blue/theme.css
@@ -118,12 +118,12 @@
 }
 .p-autocomplete-panel.p-error > .p-inputtext, .p-autocomplete-panel.p-invalid > .p-inputtext {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-calendar.p-error > .p-inputtext, .p-calendar.p-invalid > .p-inputtext {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-datepicker {
@@ -296,14 +296,14 @@
 }
 
 .p-checkbox {
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
 }
 .p-checkbox .p-checkbox-box {
   border: 1px solid #ced4da;
   background: #ffffff;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #495057;
   border-radius: 3px;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -368,7 +368,7 @@
 }
 .p-chips.p-error > .p-inputtext, .p-chips.p-invalid > .p-inputtext {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-colorpicker-preview {
@@ -472,7 +472,7 @@
 }
 .p-dropdown-panel.p-error, .p-dropdown-panel.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-editor-container .p-editor-toolbar {
@@ -627,7 +627,7 @@
 }
 .p-inputswitch.p-error, .p-inputswitch.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-inputtext {
@@ -651,7 +651,7 @@
 }
 .p-inputtext.p-error, .p-inputtext.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-float-label label {
@@ -726,7 +726,7 @@
 }
 .p-listbox.p-error, .p-listbox.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-multiselect {
@@ -827,7 +827,7 @@
 }
 .p-multiselect-panel.p-error, .p-multiselect-panel.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-password-panel {
@@ -848,8 +848,8 @@
 .p-radiobutton .p-radiobutton-box {
   border: 1px solid #ced4da;
   background: #ffffff;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #495057;
   border-radius: 50%;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -864,13 +864,17 @@
   border-color: #2196F3;
 }
 .p-radiobutton .p-radiobutton-box .p-radiobutton-icon {
-  font-size: 0.75rem;
+  width: 0.75rem;
+  height: 0.75rem;
   transition-duration: 0.2s;
+  border-radius: 50%;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight {
   border-color: #2196F3;
   background: #2196F3;
-  color: #ffffff;
+}
+.p-radiobutton .p-radiobutton-box.p-highlight .p-radiobutton-icon {
+  background-color: #ffffff;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight:not(.p-disabled):hover {
   border-color: #1976D2;
@@ -943,7 +947,7 @@
 }
 .p-selectbutton.p-error > .p-button, .p-selectbutton.p-invalid > .p-button {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-slider {
@@ -1023,7 +1027,7 @@
 }
 .p-togglebutton.p-button.p-error > .p-button, .p-togglebutton.p-button.p-invalid > .p-button {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-button {
@@ -1065,6 +1069,12 @@
 .p-button .p-badge {
   margin-left: 0.5rem;
 }
+.p-button.p-button-raised {
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
+}
+.p-button.p-button-rounded {
+  border-radius: 1rem;
+}
 .p-button.p-button-icon-only {
   width: 2.357rem;
 }
@@ -1072,11 +1082,8 @@
 .p-button.p-button-icon-only .p-button-icon-right {
   margin: 0;
 }
-.p-button.p-button-raised {
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
-}
-.p-button.p-button-rounded {
-  border-radius: 15px;
+.p-button.p-button-icon-only.p-button-rounded {
+  border-radius: 50%;
 }
 
 .p-fluid .p-button {
@@ -1299,9 +1306,9 @@
 }
 .p-datatable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #2196F3;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -1634,7 +1641,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1661,7 +1668,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1866,9 +1873,9 @@
 }
 .p-treetable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #2196F3;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -2337,7 +2344,7 @@
   border-bottom-left-radius: 3px;
 }
 .p-fileupload .p-progressbar {
-  height: 4px;
+  height: 0.25rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
@@ -2378,7 +2385,7 @@
 }
 
 .p-contextmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   color: #495057;
   border: 0 none;
@@ -2420,7 +2427,7 @@
   box-shadow: inset 0 0 0 0.15rem #BBDEFB;
 }
 .p-contextmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2436,7 +2443,7 @@
 }
 .p-contextmenu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-contextmenu .p-submenu-icon {
   font-size: 0.75rem;
@@ -2450,7 +2457,7 @@
   border-radius: 3px;
 }
 .p-megamenu .p-megamenu-root-list .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-megamenu .p-menuitem-link {
@@ -2503,12 +2510,12 @@
   border-top-left-radius: 3px;
 }
 .p-megamenu .p-megamenu-submenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   width: 12.5rem;
 }
 .p-megamenu .p-megamenu-submenu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-megamenu .p-menuitem.p-menuitem-active > .p-menuitem-link {
   background: #e9ecef;
@@ -2521,11 +2528,11 @@
 }
 .p-megamenu.p-megamenu-vertical {
   width: 12.5rem;
-  padding: 4px 0;
+  padding: 0.25rem 0;
 }
 
 .p-menu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   color: #495057;
   border: 1px solid #dee2e6;
@@ -2581,7 +2588,7 @@
 }
 .p-menu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 
 .p-menubar {
@@ -2592,7 +2599,7 @@
   border-radius: 3px;
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-menubar .p-menuitem-link {
@@ -2630,7 +2637,7 @@
   box-shadow: inset 0 0 0 0.15rem #BBDEFB;
 }
 .p-menubar .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2638,7 +2645,7 @@
 }
 .p-menubar .p-submenu-list .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-menubar .p-submenu-list .p-submenu-icon {
   font-size: 0.75rem;
@@ -2694,7 +2701,7 @@
   color: #495057;
 }
 .p-panelmenu .p-panelmenu-content {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   border: 1px solid #dee2e6;
   background: #ffffff;
   color: #495057;
@@ -2850,7 +2857,7 @@
 }
 
 .p-tieredmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   color: #495057;
   border: 1px solid #dee2e6;
@@ -2896,7 +2903,7 @@
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
 }
 .p-tieredmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2912,7 +2919,7 @@
 }
 .p-tieredmenu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-tieredmenu .p-submenu-icon {
   font-size: 0.75rem;
@@ -3331,7 +3338,7 @@
 
 .p-progressbar {
   border: 0 none;
-  height: 24px;
+  height: 1.5rem;
   background: #dee2e6;
   border-radius: 3px;
   border-radius: 3px;
@@ -3343,7 +3350,7 @@
 }
 .p-progressbar .p-progressbar-label {
   color: #495057;
-  line-height: 24px;
+  line-height: 1.5rem;
 }
 
 .p-terminal {
diff --git a/public/themes/saga-cyan/theme.css b/public/themes/saga-cyan/theme.css
index 62cf81ac3..92baa651b 100644
--- a/public/themes/saga-cyan/theme.css
+++ b/public/themes/saga-cyan/theme.css
@@ -118,12 +118,12 @@
 }
 .p-autocomplete-panel.p-error > .p-inputtext, .p-autocomplete-panel.p-invalid > .p-inputtext {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-calendar.p-error > .p-inputtext, .p-calendar.p-invalid > .p-inputtext {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-datepicker {
@@ -296,14 +296,14 @@
 }
 
 .p-checkbox {
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
 }
 .p-checkbox .p-checkbox-box {
   border: 1px solid #ced4da;
   background: #ffffff;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #495057;
   border-radius: 3px;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -368,7 +368,7 @@
 }
 .p-chips.p-error > .p-inputtext, .p-chips.p-invalid > .p-inputtext {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-colorpicker-preview {
@@ -472,7 +472,7 @@
 }
 .p-dropdown-panel.p-error, .p-dropdown-panel.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-editor-container .p-editor-toolbar {
@@ -627,7 +627,7 @@
 }
 .p-inputswitch.p-error, .p-inputswitch.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-inputtext {
@@ -651,7 +651,7 @@
 }
 .p-inputtext.p-error, .p-inputtext.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-float-label label {
@@ -726,7 +726,7 @@
 }
 .p-listbox.p-error, .p-listbox.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-multiselect {
@@ -827,7 +827,7 @@
 }
 .p-multiselect-panel.p-error, .p-multiselect-panel.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-password-panel {
@@ -848,8 +848,8 @@
 .p-radiobutton .p-radiobutton-box {
   border: 1px solid #ced4da;
   background: #ffffff;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #495057;
   border-radius: 50%;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -864,13 +864,17 @@
   border-color: #00ACC1;
 }
 .p-radiobutton .p-radiobutton-box .p-radiobutton-icon {
-  font-size: 0.75rem;
+  width: 0.75rem;
+  height: 0.75rem;
   transition-duration: 0.2s;
+  border-radius: 50%;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight {
   border-color: #00ACC1;
   background: #00ACC1;
-  color: #ffffff;
+}
+.p-radiobutton .p-radiobutton-box.p-highlight .p-radiobutton-icon {
+  background-color: #ffffff;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight:not(.p-disabled):hover {
   border-color: #00838F;
@@ -943,7 +947,7 @@
 }
 .p-selectbutton.p-error > .p-button, .p-selectbutton.p-invalid > .p-button {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-slider {
@@ -1023,7 +1027,7 @@
 }
 .p-togglebutton.p-button.p-error > .p-button, .p-togglebutton.p-button.p-invalid > .p-button {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-button {
@@ -1065,6 +1069,12 @@
 .p-button .p-badge {
   margin-left: 0.5rem;
 }
+.p-button.p-button-raised {
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
+}
+.p-button.p-button-rounded {
+  border-radius: 1rem;
+}
 .p-button.p-button-icon-only {
   width: 2.357rem;
 }
@@ -1072,11 +1082,8 @@
 .p-button.p-button-icon-only .p-button-icon-right {
   margin: 0;
 }
-.p-button.p-button-raised {
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
-}
-.p-button.p-button-rounded {
-  border-radius: 15px;
+.p-button.p-button-icon-only.p-button-rounded {
+  border-radius: 50%;
 }
 
 .p-fluid .p-button {
@@ -1299,9 +1306,9 @@
 }
 .p-datatable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #00ACC1;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -1634,7 +1641,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1661,7 +1668,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1866,9 +1873,9 @@
 }
 .p-treetable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #00ACC1;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -2337,7 +2344,7 @@
   border-bottom-left-radius: 3px;
 }
 .p-fileupload .p-progressbar {
-  height: 4px;
+  height: 0.25rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
@@ -2378,7 +2385,7 @@
 }
 
 .p-contextmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   color: #495057;
   border: 0 none;
@@ -2420,7 +2427,7 @@
   box-shadow: inset 0 0 0 0.15rem #B2EBF2;
 }
 .p-contextmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2436,7 +2443,7 @@
 }
 .p-contextmenu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-contextmenu .p-submenu-icon {
   font-size: 0.75rem;
@@ -2450,7 +2457,7 @@
   border-radius: 3px;
 }
 .p-megamenu .p-megamenu-root-list .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-megamenu .p-menuitem-link {
@@ -2503,12 +2510,12 @@
   border-top-left-radius: 3px;
 }
 .p-megamenu .p-megamenu-submenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   width: 12.5rem;
 }
 .p-megamenu .p-megamenu-submenu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-megamenu .p-menuitem.p-menuitem-active > .p-menuitem-link {
   background: #e9ecef;
@@ -2521,11 +2528,11 @@
 }
 .p-megamenu.p-megamenu-vertical {
   width: 12.5rem;
-  padding: 4px 0;
+  padding: 0.25rem 0;
 }
 
 .p-menu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   color: #495057;
   border: 1px solid #dee2e6;
@@ -2581,7 +2588,7 @@
 }
 .p-menu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 
 .p-menubar {
@@ -2592,7 +2599,7 @@
   border-radius: 3px;
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-menubar .p-menuitem-link {
@@ -2630,7 +2637,7 @@
   box-shadow: inset 0 0 0 0.15rem #B2EBF2;
 }
 .p-menubar .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2638,7 +2645,7 @@
 }
 .p-menubar .p-submenu-list .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-menubar .p-submenu-list .p-submenu-icon {
   font-size: 0.75rem;
@@ -2694,7 +2701,7 @@
   color: #495057;
 }
 .p-panelmenu .p-panelmenu-content {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   border: 1px solid #dee2e6;
   background: #ffffff;
   color: #495057;
@@ -2850,7 +2857,7 @@
 }
 
 .p-tieredmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   color: #495057;
   border: 1px solid #dee2e6;
@@ -2896,7 +2903,7 @@
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
 }
 .p-tieredmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2912,7 +2919,7 @@
 }
 .p-tieredmenu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-tieredmenu .p-submenu-icon {
   font-size: 0.75rem;
@@ -3331,7 +3338,7 @@
 
 .p-progressbar {
   border: 0 none;
-  height: 24px;
+  height: 1.5rem;
   background: #dee2e6;
   border-radius: 3px;
   border-radius: 3px;
@@ -3343,7 +3350,7 @@
 }
 .p-progressbar .p-progressbar-label {
   color: #495057;
-  line-height: 24px;
+  line-height: 1.5rem;
 }
 
 .p-terminal {
diff --git a/public/themes/saga-deeppurple/theme.css b/public/themes/saga-deeppurple/theme.css
index 905a6263c..32a1c8ecd 100644
--- a/public/themes/saga-deeppurple/theme.css
+++ b/public/themes/saga-deeppurple/theme.css
@@ -118,12 +118,12 @@
 }
 .p-autocomplete-panel.p-error > .p-inputtext, .p-autocomplete-panel.p-invalid > .p-inputtext {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-calendar.p-error > .p-inputtext, .p-calendar.p-invalid > .p-inputtext {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-datepicker {
@@ -296,14 +296,14 @@
 }
 
 .p-checkbox {
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
 }
 .p-checkbox .p-checkbox-box {
   border: 1px solid #ced4da;
   background: #ffffff;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #495057;
   border-radius: 3px;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -368,7 +368,7 @@
 }
 .p-chips.p-error > .p-inputtext, .p-chips.p-invalid > .p-inputtext {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-colorpicker-preview {
@@ -472,7 +472,7 @@
 }
 .p-dropdown-panel.p-error, .p-dropdown-panel.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-editor-container .p-editor-toolbar {
@@ -627,7 +627,7 @@
 }
 .p-inputswitch.p-error, .p-inputswitch.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-inputtext {
@@ -651,7 +651,7 @@
 }
 .p-inputtext.p-error, .p-inputtext.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-float-label label {
@@ -726,7 +726,7 @@
 }
 .p-listbox.p-error, .p-listbox.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-multiselect {
@@ -827,7 +827,7 @@
 }
 .p-multiselect-panel.p-error, .p-multiselect-panel.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-password-panel {
@@ -848,8 +848,8 @@
 .p-radiobutton .p-radiobutton-box {
   border: 1px solid #ced4da;
   background: #ffffff;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #495057;
   border-radius: 50%;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -864,13 +864,17 @@
   border-color: #673AB7;
 }
 .p-radiobutton .p-radiobutton-box .p-radiobutton-icon {
-  font-size: 0.75rem;
+  width: 0.75rem;
+  height: 0.75rem;
   transition-duration: 0.2s;
+  border-radius: 50%;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight {
   border-color: #673AB7;
   background: #673AB7;
-  color: #ffffff;
+}
+.p-radiobutton .p-radiobutton-box.p-highlight .p-radiobutton-icon {
+  background-color: #ffffff;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight:not(.p-disabled):hover {
   border-color: #512DA8;
@@ -943,7 +947,7 @@
 }
 .p-selectbutton.p-error > .p-button, .p-selectbutton.p-invalid > .p-button {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-slider {
@@ -1023,7 +1027,7 @@
 }
 .p-togglebutton.p-button.p-error > .p-button, .p-togglebutton.p-button.p-invalid > .p-button {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-button {
@@ -1065,6 +1069,12 @@
 .p-button .p-badge {
   margin-left: 0.5rem;
 }
+.p-button.p-button-raised {
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
+}
+.p-button.p-button-rounded {
+  border-radius: 1rem;
+}
 .p-button.p-button-icon-only {
   width: 2.357rem;
 }
@@ -1072,11 +1082,8 @@
 .p-button.p-button-icon-only .p-button-icon-right {
   margin: 0;
 }
-.p-button.p-button-raised {
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
-}
-.p-button.p-button-rounded {
-  border-radius: 15px;
+.p-button.p-button-icon-only.p-button-rounded {
+  border-radius: 50%;
 }
 
 .p-fluid .p-button {
@@ -1299,9 +1306,9 @@
 }
 .p-datatable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #673AB7;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -1634,7 +1641,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1661,7 +1668,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1866,9 +1873,9 @@
 }
 .p-treetable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #673AB7;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -2337,7 +2344,7 @@
   border-bottom-left-radius: 3px;
 }
 .p-fileupload .p-progressbar {
-  height: 4px;
+  height: 0.25rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
@@ -2378,7 +2385,7 @@
 }
 
 .p-contextmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   color: #495057;
   border: 0 none;
@@ -2420,7 +2427,7 @@
   box-shadow: inset 0 0 0 0.15rem #D1C4E9;
 }
 .p-contextmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2436,7 +2443,7 @@
 }
 .p-contextmenu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-contextmenu .p-submenu-icon {
   font-size: 0.75rem;
@@ -2450,7 +2457,7 @@
   border-radius: 3px;
 }
 .p-megamenu .p-megamenu-root-list .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-megamenu .p-menuitem-link {
@@ -2503,12 +2510,12 @@
   border-top-left-radius: 3px;
 }
 .p-megamenu .p-megamenu-submenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   width: 12.5rem;
 }
 .p-megamenu .p-megamenu-submenu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-megamenu .p-menuitem.p-menuitem-active > .p-menuitem-link {
   background: #e9ecef;
@@ -2521,11 +2528,11 @@
 }
 .p-megamenu.p-megamenu-vertical {
   width: 12.5rem;
-  padding: 4px 0;
+  padding: 0.25rem 0;
 }
 
 .p-menu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   color: #495057;
   border: 1px solid #dee2e6;
@@ -2581,7 +2588,7 @@
 }
 .p-menu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 
 .p-menubar {
@@ -2592,7 +2599,7 @@
   border-radius: 3px;
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-menubar .p-menuitem-link {
@@ -2630,7 +2637,7 @@
   box-shadow: inset 0 0 0 0.15rem #D1C4E9;
 }
 .p-menubar .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2638,7 +2645,7 @@
 }
 .p-menubar .p-submenu-list .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-menubar .p-submenu-list .p-submenu-icon {
   font-size: 0.75rem;
@@ -2694,7 +2701,7 @@
   color: #495057;
 }
 .p-panelmenu .p-panelmenu-content {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   border: 1px solid #dee2e6;
   background: #ffffff;
   color: #495057;
@@ -2850,7 +2857,7 @@
 }
 
 .p-tieredmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   color: #495057;
   border: 1px solid #dee2e6;
@@ -2896,7 +2903,7 @@
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
 }
 .p-tieredmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2912,7 +2919,7 @@
 }
 .p-tieredmenu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-tieredmenu .p-submenu-icon {
   font-size: 0.75rem;
@@ -3331,7 +3338,7 @@
 
 .p-progressbar {
   border: 0 none;
-  height: 24px;
+  height: 1.5rem;
   background: #dee2e6;
   border-radius: 3px;
   border-radius: 3px;
@@ -3343,7 +3350,7 @@
 }
 .p-progressbar .p-progressbar-label {
   color: #495057;
-  line-height: 24px;
+  line-height: 1.5rem;
 }
 
 .p-terminal {
diff --git a/public/themes/saga-green/theme.css b/public/themes/saga-green/theme.css
index d8b6bddd6..40bf3dcf0 100644
--- a/public/themes/saga-green/theme.css
+++ b/public/themes/saga-green/theme.css
@@ -118,12 +118,12 @@
 }
 .p-autocomplete-panel.p-error > .p-inputtext, .p-autocomplete-panel.p-invalid > .p-inputtext {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-calendar.p-error > .p-inputtext, .p-calendar.p-invalid > .p-inputtext {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-datepicker {
@@ -296,14 +296,14 @@
 }
 
 .p-checkbox {
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
 }
 .p-checkbox .p-checkbox-box {
   border: 1px solid #ced4da;
   background: #ffffff;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #495057;
   border-radius: 3px;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -368,7 +368,7 @@
 }
 .p-chips.p-error > .p-inputtext, .p-chips.p-invalid > .p-inputtext {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-colorpicker-preview {
@@ -472,7 +472,7 @@
 }
 .p-dropdown-panel.p-error, .p-dropdown-panel.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-editor-container .p-editor-toolbar {
@@ -627,7 +627,7 @@
 }
 .p-inputswitch.p-error, .p-inputswitch.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-inputtext {
@@ -651,7 +651,7 @@
 }
 .p-inputtext.p-error, .p-inputtext.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-float-label label {
@@ -726,7 +726,7 @@
 }
 .p-listbox.p-error, .p-listbox.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-multiselect {
@@ -827,7 +827,7 @@
 }
 .p-multiselect-panel.p-error, .p-multiselect-panel.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-password-panel {
@@ -848,8 +848,8 @@
 .p-radiobutton .p-radiobutton-box {
   border: 1px solid #ced4da;
   background: #ffffff;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #495057;
   border-radius: 50%;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -864,13 +864,17 @@
   border-color: #4CAF50;
 }
 .p-radiobutton .p-radiobutton-box .p-radiobutton-icon {
-  font-size: 0.75rem;
+  width: 0.75rem;
+  height: 0.75rem;
   transition-duration: 0.2s;
+  border-radius: 50%;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight {
   border-color: #4CAF50;
   background: #4CAF50;
-  color: #ffffff;
+}
+.p-radiobutton .p-radiobutton-box.p-highlight .p-radiobutton-icon {
+  background-color: #ffffff;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight:not(.p-disabled):hover {
   border-color: #388E3C;
@@ -943,7 +947,7 @@
 }
 .p-selectbutton.p-error > .p-button, .p-selectbutton.p-invalid > .p-button {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-slider {
@@ -1023,7 +1027,7 @@
 }
 .p-togglebutton.p-button.p-error > .p-button, .p-togglebutton.p-button.p-invalid > .p-button {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-button {
@@ -1065,6 +1069,12 @@
 .p-button .p-badge {
   margin-left: 0.5rem;
 }
+.p-button.p-button-raised {
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
+}
+.p-button.p-button-rounded {
+  border-radius: 1rem;
+}
 .p-button.p-button-icon-only {
   width: 2.357rem;
 }
@@ -1072,11 +1082,8 @@
 .p-button.p-button-icon-only .p-button-icon-right {
   margin: 0;
 }
-.p-button.p-button-raised {
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
-}
-.p-button.p-button-rounded {
-  border-radius: 15px;
+.p-button.p-button-icon-only.p-button-rounded {
+  border-radius: 50%;
 }
 
 .p-fluid .p-button {
@@ -1299,9 +1306,9 @@
 }
 .p-datatable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #4CAF50;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -1634,7 +1641,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1661,7 +1668,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1866,9 +1873,9 @@
 }
 .p-treetable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #4CAF50;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -2337,7 +2344,7 @@
   border-bottom-left-radius: 3px;
 }
 .p-fileupload .p-progressbar {
-  height: 4px;
+  height: 0.25rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
@@ -2378,7 +2385,7 @@
 }
 
 .p-contextmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   color: #495057;
   border: 0 none;
@@ -2420,7 +2427,7 @@
   box-shadow: inset 0 0 0 0.15rem #C8E6C9;
 }
 .p-contextmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2436,7 +2443,7 @@
 }
 .p-contextmenu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-contextmenu .p-submenu-icon {
   font-size: 0.75rem;
@@ -2450,7 +2457,7 @@
   border-radius: 3px;
 }
 .p-megamenu .p-megamenu-root-list .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-megamenu .p-menuitem-link {
@@ -2503,12 +2510,12 @@
   border-top-left-radius: 3px;
 }
 .p-megamenu .p-megamenu-submenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   width: 12.5rem;
 }
 .p-megamenu .p-megamenu-submenu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-megamenu .p-menuitem.p-menuitem-active > .p-menuitem-link {
   background: #e9ecef;
@@ -2521,11 +2528,11 @@
 }
 .p-megamenu.p-megamenu-vertical {
   width: 12.5rem;
-  padding: 4px 0;
+  padding: 0.25rem 0;
 }
 
 .p-menu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   color: #495057;
   border: 1px solid #dee2e6;
@@ -2581,7 +2588,7 @@
 }
 .p-menu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 
 .p-menubar {
@@ -2592,7 +2599,7 @@
   border-radius: 3px;
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-menubar .p-menuitem-link {
@@ -2630,7 +2637,7 @@
   box-shadow: inset 0 0 0 0.15rem #C8E6C9;
 }
 .p-menubar .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2638,7 +2645,7 @@
 }
 .p-menubar .p-submenu-list .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-menubar .p-submenu-list .p-submenu-icon {
   font-size: 0.75rem;
@@ -2694,7 +2701,7 @@
   color: #495057;
 }
 .p-panelmenu .p-panelmenu-content {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   border: 1px solid #dee2e6;
   background: #ffffff;
   color: #495057;
@@ -2850,7 +2857,7 @@
 }
 
 .p-tieredmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   color: #495057;
   border: 1px solid #dee2e6;
@@ -2896,7 +2903,7 @@
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
 }
 .p-tieredmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2912,7 +2919,7 @@
 }
 .p-tieredmenu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-tieredmenu .p-submenu-icon {
   font-size: 0.75rem;
@@ -3331,7 +3338,7 @@
 
 .p-progressbar {
   border: 0 none;
-  height: 24px;
+  height: 1.5rem;
   background: #dee2e6;
   border-radius: 3px;
   border-radius: 3px;
@@ -3343,7 +3350,7 @@
 }
 .p-progressbar .p-progressbar-label {
   color: #495057;
-  line-height: 24px;
+  line-height: 1.5rem;
 }
 
 .p-terminal {
diff --git a/public/themes/saga-indigo/theme.css b/public/themes/saga-indigo/theme.css
index 16b6fcd08..fa1f29d91 100644
--- a/public/themes/saga-indigo/theme.css
+++ b/public/themes/saga-indigo/theme.css
@@ -118,12 +118,12 @@
 }
 .p-autocomplete-panel.p-error > .p-inputtext, .p-autocomplete-panel.p-invalid > .p-inputtext {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-calendar.p-error > .p-inputtext, .p-calendar.p-invalid > .p-inputtext {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-datepicker {
@@ -296,14 +296,14 @@
 }
 
 .p-checkbox {
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
 }
 .p-checkbox .p-checkbox-box {
   border: 1px solid #ced4da;
   background: #ffffff;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #495057;
   border-radius: 3px;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -368,7 +368,7 @@
 }
 .p-chips.p-error > .p-inputtext, .p-chips.p-invalid > .p-inputtext {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-colorpicker-preview {
@@ -472,7 +472,7 @@
 }
 .p-dropdown-panel.p-error, .p-dropdown-panel.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-editor-container .p-editor-toolbar {
@@ -627,7 +627,7 @@
 }
 .p-inputswitch.p-error, .p-inputswitch.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-inputtext {
@@ -651,7 +651,7 @@
 }
 .p-inputtext.p-error, .p-inputtext.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-float-label label {
@@ -726,7 +726,7 @@
 }
 .p-listbox.p-error, .p-listbox.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-multiselect {
@@ -827,7 +827,7 @@
 }
 .p-multiselect-panel.p-error, .p-multiselect-panel.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-password-panel {
@@ -848,8 +848,8 @@
 .p-radiobutton .p-radiobutton-box {
   border: 1px solid #ced4da;
   background: #ffffff;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #495057;
   border-radius: 50%;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -864,13 +864,17 @@
   border-color: #3F51B5;
 }
 .p-radiobutton .p-radiobutton-box .p-radiobutton-icon {
-  font-size: 0.75rem;
+  width: 0.75rem;
+  height: 0.75rem;
   transition-duration: 0.2s;
+  border-radius: 50%;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight {
   border-color: #3F51B5;
   background: #3F51B5;
-  color: #ffffff;
+}
+.p-radiobutton .p-radiobutton-box.p-highlight .p-radiobutton-icon {
+  background-color: #ffffff;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight:not(.p-disabled):hover {
   border-color: #303F9F;
@@ -943,7 +947,7 @@
 }
 .p-selectbutton.p-error > .p-button, .p-selectbutton.p-invalid > .p-button {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-slider {
@@ -1023,7 +1027,7 @@
 }
 .p-togglebutton.p-button.p-error > .p-button, .p-togglebutton.p-button.p-invalid > .p-button {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-button {
@@ -1065,6 +1069,12 @@
 .p-button .p-badge {
   margin-left: 0.5rem;
 }
+.p-button.p-button-raised {
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
+}
+.p-button.p-button-rounded {
+  border-radius: 1rem;
+}
 .p-button.p-button-icon-only {
   width: 2.357rem;
 }
@@ -1072,11 +1082,8 @@
 .p-button.p-button-icon-only .p-button-icon-right {
   margin: 0;
 }
-.p-button.p-button-raised {
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
-}
-.p-button.p-button-rounded {
-  border-radius: 15px;
+.p-button.p-button-icon-only.p-button-rounded {
+  border-radius: 50%;
 }
 
 .p-fluid .p-button {
@@ -1299,9 +1306,9 @@
 }
 .p-datatable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #3F51B5;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -1634,7 +1641,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1661,7 +1668,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1866,9 +1873,9 @@
 }
 .p-treetable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #3F51B5;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -2337,7 +2344,7 @@
   border-bottom-left-radius: 3px;
 }
 .p-fileupload .p-progressbar {
-  height: 4px;
+  height: 0.25rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
@@ -2378,7 +2385,7 @@
 }
 
 .p-contextmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   color: #495057;
   border: 0 none;
@@ -2420,7 +2427,7 @@
   box-shadow: inset 0 0 0 0.15rem #C5CAE9;
 }
 .p-contextmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2436,7 +2443,7 @@
 }
 .p-contextmenu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-contextmenu .p-submenu-icon {
   font-size: 0.75rem;
@@ -2450,7 +2457,7 @@
   border-radius: 3px;
 }
 .p-megamenu .p-megamenu-root-list .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-megamenu .p-menuitem-link {
@@ -2503,12 +2510,12 @@
   border-top-left-radius: 3px;
 }
 .p-megamenu .p-megamenu-submenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   width: 12.5rem;
 }
 .p-megamenu .p-megamenu-submenu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-megamenu .p-menuitem.p-menuitem-active > .p-menuitem-link {
   background: #e9ecef;
@@ -2521,11 +2528,11 @@
 }
 .p-megamenu.p-megamenu-vertical {
   width: 12.5rem;
-  padding: 4px 0;
+  padding: 0.25rem 0;
 }
 
 .p-menu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   color: #495057;
   border: 1px solid #dee2e6;
@@ -2581,7 +2588,7 @@
 }
 .p-menu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 
 .p-menubar {
@@ -2592,7 +2599,7 @@
   border-radius: 3px;
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-menubar .p-menuitem-link {
@@ -2630,7 +2637,7 @@
   box-shadow: inset 0 0 0 0.15rem #C5CAE9;
 }
 .p-menubar .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2638,7 +2645,7 @@
 }
 .p-menubar .p-submenu-list .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-menubar .p-submenu-list .p-submenu-icon {
   font-size: 0.75rem;
@@ -2694,7 +2701,7 @@
   color: #495057;
 }
 .p-panelmenu .p-panelmenu-content {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   border: 1px solid #dee2e6;
   background: #ffffff;
   color: #495057;
@@ -2850,7 +2857,7 @@
 }
 
 .p-tieredmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   color: #495057;
   border: 1px solid #dee2e6;
@@ -2896,7 +2903,7 @@
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
 }
 .p-tieredmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2912,7 +2919,7 @@
 }
 .p-tieredmenu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-tieredmenu .p-submenu-icon {
   font-size: 0.75rem;
@@ -3331,7 +3338,7 @@
 
 .p-progressbar {
   border: 0 none;
-  height: 24px;
+  height: 1.5rem;
   background: #dee2e6;
   border-radius: 3px;
   border-radius: 3px;
@@ -3343,7 +3350,7 @@
 }
 .p-progressbar .p-progressbar-label {
   color: #495057;
-  line-height: 24px;
+  line-height: 1.5rem;
 }
 
 .p-terminal {
diff --git a/public/themes/saga-orange/theme.css b/public/themes/saga-orange/theme.css
index bf4492a07..ac75921b7 100644
--- a/public/themes/saga-orange/theme.css
+++ b/public/themes/saga-orange/theme.css
@@ -118,12 +118,12 @@
 }
 .p-autocomplete-panel.p-error > .p-inputtext, .p-autocomplete-panel.p-invalid > .p-inputtext {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-calendar.p-error > .p-inputtext, .p-calendar.p-invalid > .p-inputtext {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-datepicker {
@@ -296,14 +296,14 @@
 }
 
 .p-checkbox {
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
 }
 .p-checkbox .p-checkbox-box {
   border: 1px solid #ced4da;
   background: #ffffff;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #495057;
   border-radius: 3px;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -368,7 +368,7 @@
 }
 .p-chips.p-error > .p-inputtext, .p-chips.p-invalid > .p-inputtext {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-colorpicker-preview {
@@ -472,7 +472,7 @@
 }
 .p-dropdown-panel.p-error, .p-dropdown-panel.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-editor-container .p-editor-toolbar {
@@ -627,7 +627,7 @@
 }
 .p-inputswitch.p-error, .p-inputswitch.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-inputtext {
@@ -651,7 +651,7 @@
 }
 .p-inputtext.p-error, .p-inputtext.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-float-label label {
@@ -726,7 +726,7 @@
 }
 .p-listbox.p-error, .p-listbox.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-multiselect {
@@ -827,7 +827,7 @@
 }
 .p-multiselect-panel.p-error, .p-multiselect-panel.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-password-panel {
@@ -848,8 +848,8 @@
 .p-radiobutton .p-radiobutton-box {
   border: 1px solid #ced4da;
   background: #ffffff;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #495057;
   border-radius: 50%;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -864,13 +864,17 @@
   border-color: #FFC107;
 }
 .p-radiobutton .p-radiobutton-box .p-radiobutton-icon {
-  font-size: 0.75rem;
+  width: 0.75rem;
+  height: 0.75rem;
   transition-duration: 0.2s;
+  border-radius: 50%;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight {
   border-color: #FFC107;
   background: #FFC107;
-  color: #212529;
+}
+.p-radiobutton .p-radiobutton-box.p-highlight .p-radiobutton-icon {
+  background-color: #212529;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight:not(.p-disabled):hover {
   border-color: #FFA000;
@@ -943,7 +947,7 @@
 }
 .p-selectbutton.p-error > .p-button, .p-selectbutton.p-invalid > .p-button {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-slider {
@@ -1023,7 +1027,7 @@
 }
 .p-togglebutton.p-button.p-error > .p-button, .p-togglebutton.p-button.p-invalid > .p-button {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-button {
@@ -1065,6 +1069,12 @@
 .p-button .p-badge {
   margin-left: 0.5rem;
 }
+.p-button.p-button-raised {
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
+}
+.p-button.p-button-rounded {
+  border-radius: 1rem;
+}
 .p-button.p-button-icon-only {
   width: 2.357rem;
 }
@@ -1072,11 +1082,8 @@
 .p-button.p-button-icon-only .p-button-icon-right {
   margin: 0;
 }
-.p-button.p-button-raised {
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
-}
-.p-button.p-button-rounded {
-  border-radius: 15px;
+.p-button.p-button-icon-only.p-button-rounded {
+  border-radius: 50%;
 }
 
 .p-fluid .p-button {
@@ -1299,9 +1306,9 @@
 }
 .p-datatable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #FFC107;
   background: #212529;
   margin-left: 0.5rem;
@@ -1634,7 +1641,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1661,7 +1668,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1866,9 +1873,9 @@
 }
 .p-treetable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #FFC107;
   background: #212529;
   margin-left: 0.5rem;
@@ -2337,7 +2344,7 @@
   border-bottom-left-radius: 3px;
 }
 .p-fileupload .p-progressbar {
-  height: 4px;
+  height: 0.25rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
@@ -2378,7 +2385,7 @@
 }
 
 .p-contextmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   color: #495057;
   border: 0 none;
@@ -2420,7 +2427,7 @@
   box-shadow: inset 0 0 0 0.15rem #FFECB3;
 }
 .p-contextmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2436,7 +2443,7 @@
 }
 .p-contextmenu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-contextmenu .p-submenu-icon {
   font-size: 0.75rem;
@@ -2450,7 +2457,7 @@
   border-radius: 3px;
 }
 .p-megamenu .p-megamenu-root-list .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-megamenu .p-menuitem-link {
@@ -2503,12 +2510,12 @@
   border-top-left-radius: 3px;
 }
 .p-megamenu .p-megamenu-submenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   width: 12.5rem;
 }
 .p-megamenu .p-megamenu-submenu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-megamenu .p-menuitem.p-menuitem-active > .p-menuitem-link {
   background: #e9ecef;
@@ -2521,11 +2528,11 @@
 }
 .p-megamenu.p-megamenu-vertical {
   width: 12.5rem;
-  padding: 4px 0;
+  padding: 0.25rem 0;
 }
 
 .p-menu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   color: #495057;
   border: 1px solid #dee2e6;
@@ -2581,7 +2588,7 @@
 }
 .p-menu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 
 .p-menubar {
@@ -2592,7 +2599,7 @@
   border-radius: 3px;
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-menubar .p-menuitem-link {
@@ -2630,7 +2637,7 @@
   box-shadow: inset 0 0 0 0.15rem #FFECB3;
 }
 .p-menubar .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2638,7 +2645,7 @@
 }
 .p-menubar .p-submenu-list .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-menubar .p-submenu-list .p-submenu-icon {
   font-size: 0.75rem;
@@ -2694,7 +2701,7 @@
   color: #495057;
 }
 .p-panelmenu .p-panelmenu-content {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   border: 1px solid #dee2e6;
   background: #ffffff;
   color: #495057;
@@ -2850,7 +2857,7 @@
 }
 
 .p-tieredmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   color: #495057;
   border: 1px solid #dee2e6;
@@ -2896,7 +2903,7 @@
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
 }
 .p-tieredmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2912,7 +2919,7 @@
 }
 .p-tieredmenu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-tieredmenu .p-submenu-icon {
   font-size: 0.75rem;
@@ -3331,7 +3338,7 @@
 
 .p-progressbar {
   border: 0 none;
-  height: 24px;
+  height: 1.5rem;
   background: #dee2e6;
   border-radius: 3px;
   border-radius: 3px;
@@ -3343,7 +3350,7 @@
 }
 .p-progressbar .p-progressbar-label {
   color: #495057;
-  line-height: 24px;
+  line-height: 1.5rem;
 }
 
 .p-terminal {
diff --git a/public/themes/saga-purple/theme.css b/public/themes/saga-purple/theme.css
index 371f4fcf0..2fd50c5d4 100644
--- a/public/themes/saga-purple/theme.css
+++ b/public/themes/saga-purple/theme.css
@@ -118,12 +118,12 @@
 }
 .p-autocomplete-panel.p-error > .p-inputtext, .p-autocomplete-panel.p-invalid > .p-inputtext {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-calendar.p-error > .p-inputtext, .p-calendar.p-invalid > .p-inputtext {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-datepicker {
@@ -296,14 +296,14 @@
 }
 
 .p-checkbox {
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
 }
 .p-checkbox .p-checkbox-box {
   border: 1px solid #ced4da;
   background: #ffffff;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #495057;
   border-radius: 3px;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -368,7 +368,7 @@
 }
 .p-chips.p-error > .p-inputtext, .p-chips.p-invalid > .p-inputtext {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-colorpicker-preview {
@@ -472,7 +472,7 @@
 }
 .p-dropdown-panel.p-error, .p-dropdown-panel.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-editor-container .p-editor-toolbar {
@@ -627,7 +627,7 @@
 }
 .p-inputswitch.p-error, .p-inputswitch.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-inputtext {
@@ -651,7 +651,7 @@
 }
 .p-inputtext.p-error, .p-inputtext.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-float-label label {
@@ -726,7 +726,7 @@
 }
 .p-listbox.p-error, .p-listbox.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-multiselect {
@@ -827,7 +827,7 @@
 }
 .p-multiselect-panel.p-error, .p-multiselect-panel.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-password-panel {
@@ -848,8 +848,8 @@
 .p-radiobutton .p-radiobutton-box {
   border: 1px solid #ced4da;
   background: #ffffff;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #495057;
   border-radius: 50%;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -864,13 +864,17 @@
   border-color: #9C27B0;
 }
 .p-radiobutton .p-radiobutton-box .p-radiobutton-icon {
-  font-size: 0.75rem;
+  width: 0.75rem;
+  height: 0.75rem;
   transition-duration: 0.2s;
+  border-radius: 50%;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight {
   border-color: #9C27B0;
   background: #9C27B0;
-  color: #ffffff;
+}
+.p-radiobutton .p-radiobutton-box.p-highlight .p-radiobutton-icon {
+  background-color: #ffffff;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight:not(.p-disabled):hover {
   border-color: #7B1FA2;
@@ -943,7 +947,7 @@
 }
 .p-selectbutton.p-error > .p-button, .p-selectbutton.p-invalid > .p-button {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-slider {
@@ -1023,7 +1027,7 @@
 }
 .p-togglebutton.p-button.p-error > .p-button, .p-togglebutton.p-button.p-invalid > .p-button {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-button {
@@ -1065,6 +1069,12 @@
 .p-button .p-badge {
   margin-left: 0.5rem;
 }
+.p-button.p-button-raised {
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
+}
+.p-button.p-button-rounded {
+  border-radius: 1rem;
+}
 .p-button.p-button-icon-only {
   width: 2.357rem;
 }
@@ -1072,11 +1082,8 @@
 .p-button.p-button-icon-only .p-button-icon-right {
   margin: 0;
 }
-.p-button.p-button-raised {
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
-}
-.p-button.p-button-rounded {
-  border-radius: 15px;
+.p-button.p-button-icon-only.p-button-rounded {
+  border-radius: 50%;
 }
 
 .p-fluid .p-button {
@@ -1299,9 +1306,9 @@
 }
 .p-datatable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #9C27B0;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -1634,7 +1641,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1661,7 +1668,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1866,9 +1873,9 @@
 }
 .p-treetable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #9C27B0;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -2337,7 +2344,7 @@
   border-bottom-left-radius: 3px;
 }
 .p-fileupload .p-progressbar {
-  height: 4px;
+  height: 0.25rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
@@ -2378,7 +2385,7 @@
 }
 
 .p-contextmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   color: #495057;
   border: 0 none;
@@ -2420,7 +2427,7 @@
   box-shadow: inset 0 0 0 0.15rem #E1BEE7;
 }
 .p-contextmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2436,7 +2443,7 @@
 }
 .p-contextmenu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-contextmenu .p-submenu-icon {
   font-size: 0.75rem;
@@ -2450,7 +2457,7 @@
   border-radius: 3px;
 }
 .p-megamenu .p-megamenu-root-list .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-megamenu .p-menuitem-link {
@@ -2503,12 +2510,12 @@
   border-top-left-radius: 3px;
 }
 .p-megamenu .p-megamenu-submenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   width: 12.5rem;
 }
 .p-megamenu .p-megamenu-submenu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-megamenu .p-menuitem.p-menuitem-active > .p-menuitem-link {
   background: #e9ecef;
@@ -2521,11 +2528,11 @@
 }
 .p-megamenu.p-megamenu-vertical {
   width: 12.5rem;
-  padding: 4px 0;
+  padding: 0.25rem 0;
 }
 
 .p-menu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   color: #495057;
   border: 1px solid #dee2e6;
@@ -2581,7 +2588,7 @@
 }
 .p-menu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 
 .p-menubar {
@@ -2592,7 +2599,7 @@
   border-radius: 3px;
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-menubar .p-menuitem-link {
@@ -2630,7 +2637,7 @@
   box-shadow: inset 0 0 0 0.15rem #E1BEE7;
 }
 .p-menubar .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2638,7 +2645,7 @@
 }
 .p-menubar .p-submenu-list .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-menubar .p-submenu-list .p-submenu-icon {
   font-size: 0.75rem;
@@ -2694,7 +2701,7 @@
   color: #495057;
 }
 .p-panelmenu .p-panelmenu-content {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   border: 1px solid #dee2e6;
   background: #ffffff;
   color: #495057;
@@ -2850,7 +2857,7 @@
 }
 
 .p-tieredmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   color: #495057;
   border: 1px solid #dee2e6;
@@ -2896,7 +2903,7 @@
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
 }
 .p-tieredmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2912,7 +2919,7 @@
 }
 .p-tieredmenu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-tieredmenu .p-submenu-icon {
   font-size: 0.75rem;
@@ -3331,7 +3338,7 @@
 
 .p-progressbar {
   border: 0 none;
-  height: 24px;
+  height: 1.5rem;
   background: #dee2e6;
   border-radius: 3px;
   border-radius: 3px;
@@ -3343,7 +3350,7 @@
 }
 .p-progressbar .p-progressbar-label {
   color: #495057;
-  line-height: 24px;
+  line-height: 1.5rem;
 }
 
 .p-terminal {
diff --git a/public/themes/saga-teal/theme.css b/public/themes/saga-teal/theme.css
index 9bc4a4e17..6e0a4608b 100644
--- a/public/themes/saga-teal/theme.css
+++ b/public/themes/saga-teal/theme.css
@@ -118,12 +118,12 @@
 }
 .p-autocomplete-panel.p-error > .p-inputtext, .p-autocomplete-panel.p-invalid > .p-inputtext {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-calendar.p-error > .p-inputtext, .p-calendar.p-invalid > .p-inputtext {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-datepicker {
@@ -296,14 +296,14 @@
 }
 
 .p-checkbox {
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
 }
 .p-checkbox .p-checkbox-box {
   border: 1px solid #ced4da;
   background: #ffffff;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #495057;
   border-radius: 3px;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -368,7 +368,7 @@
 }
 .p-chips.p-error > .p-inputtext, .p-chips.p-invalid > .p-inputtext {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-colorpicker-preview {
@@ -472,7 +472,7 @@
 }
 .p-dropdown-panel.p-error, .p-dropdown-panel.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-editor-container .p-editor-toolbar {
@@ -627,7 +627,7 @@
 }
 .p-inputswitch.p-error, .p-inputswitch.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-inputtext {
@@ -651,7 +651,7 @@
 }
 .p-inputtext.p-error, .p-inputtext.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-float-label label {
@@ -726,7 +726,7 @@
 }
 .p-listbox.p-error, .p-listbox.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-multiselect {
@@ -827,7 +827,7 @@
 }
 .p-multiselect-panel.p-error, .p-multiselect-panel.p-invalid {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-password-panel {
@@ -848,8 +848,8 @@
 .p-radiobutton .p-radiobutton-box {
   border: 1px solid #ced4da;
   background: #ffffff;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #495057;
   border-radius: 50%;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -864,13 +864,17 @@
   border-color: #009688;
 }
 .p-radiobutton .p-radiobutton-box .p-radiobutton-icon {
-  font-size: 0.75rem;
+  width: 0.75rem;
+  height: 0.75rem;
   transition-duration: 0.2s;
+  border-radius: 50%;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight {
   border-color: #009688;
   background: #009688;
-  color: #ffffff;
+}
+.p-radiobutton .p-radiobutton-box.p-highlight .p-radiobutton-icon {
+  background-color: #ffffff;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight:not(.p-disabled):hover {
   border-color: #00796B;
@@ -943,7 +947,7 @@
 }
 .p-selectbutton.p-error > .p-button, .p-selectbutton.p-invalid > .p-button {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-slider {
@@ -1023,7 +1027,7 @@
 }
 .p-togglebutton.p-button.p-error > .p-button, .p-togglebutton.p-button.p-invalid > .p-button {
   border-color: #f44336;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-button {
@@ -1065,6 +1069,12 @@
 .p-button .p-badge {
   margin-left: 0.5rem;
 }
+.p-button.p-button-raised {
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
+}
+.p-button.p-button-rounded {
+  border-radius: 1rem;
+}
 .p-button.p-button-icon-only {
   width: 2.357rem;
 }
@@ -1072,11 +1082,8 @@
 .p-button.p-button-icon-only .p-button-icon-right {
   margin: 0;
 }
-.p-button.p-button-raised {
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
-}
-.p-button.p-button-rounded {
-  border-radius: 15px;
+.p-button.p-button-icon-only.p-button-rounded {
+  border-radius: 50%;
 }
 
 .p-fluid .p-button {
@@ -1299,9 +1306,9 @@
 }
 .p-datatable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #009688;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -1634,7 +1641,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1661,7 +1668,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1866,9 +1873,9 @@
 }
 .p-treetable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #009688;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -2337,7 +2344,7 @@
   border-bottom-left-radius: 3px;
 }
 .p-fileupload .p-progressbar {
-  height: 4px;
+  height: 0.25rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
@@ -2378,7 +2385,7 @@
 }
 
 .p-contextmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   color: #495057;
   border: 0 none;
@@ -2420,7 +2427,7 @@
   box-shadow: inset 0 0 0 0.15rem #B2DFDB;
 }
 .p-contextmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2436,7 +2443,7 @@
 }
 .p-contextmenu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-contextmenu .p-submenu-icon {
   font-size: 0.75rem;
@@ -2450,7 +2457,7 @@
   border-radius: 3px;
 }
 .p-megamenu .p-megamenu-root-list .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-megamenu .p-menuitem-link {
@@ -2503,12 +2510,12 @@
   border-top-left-radius: 3px;
 }
 .p-megamenu .p-megamenu-submenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   width: 12.5rem;
 }
 .p-megamenu .p-megamenu-submenu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-megamenu .p-menuitem.p-menuitem-active > .p-menuitem-link {
   background: #e9ecef;
@@ -2521,11 +2528,11 @@
 }
 .p-megamenu.p-megamenu-vertical {
   width: 12.5rem;
-  padding: 4px 0;
+  padding: 0.25rem 0;
 }
 
 .p-menu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   color: #495057;
   border: 1px solid #dee2e6;
@@ -2581,7 +2588,7 @@
 }
 .p-menu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 
 .p-menubar {
@@ -2592,7 +2599,7 @@
   border-radius: 3px;
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-menubar .p-menuitem-link {
@@ -2630,7 +2637,7 @@
   box-shadow: inset 0 0 0 0.15rem #B2DFDB;
 }
 .p-menubar .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2638,7 +2645,7 @@
 }
 .p-menubar .p-submenu-list .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-menubar .p-submenu-list .p-submenu-icon {
   font-size: 0.75rem;
@@ -2694,7 +2701,7 @@
   color: #495057;
 }
 .p-panelmenu .p-panelmenu-content {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   border: 1px solid #dee2e6;
   background: #ffffff;
   color: #495057;
@@ -2850,7 +2857,7 @@
 }
 
 .p-tieredmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   color: #495057;
   border: 1px solid #dee2e6;
@@ -2896,7 +2903,7 @@
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
 }
 .p-tieredmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #ffffff;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2912,7 +2919,7 @@
 }
 .p-tieredmenu .p-menu-separator {
   border-top: 1px solid #dee2e6;
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-tieredmenu .p-submenu-icon {
   font-size: 0.75rem;
@@ -3331,7 +3338,7 @@
 
 .p-progressbar {
   border: 0 none;
-  height: 24px;
+  height: 1.5rem;
   background: #dee2e6;
   border-radius: 3px;
   border-radius: 3px;
@@ -3343,7 +3350,7 @@
 }
 .p-progressbar .p-progressbar-label {
   color: #495057;
-  line-height: 24px;
+  line-height: 1.5rem;
 }
 
 .p-terminal {
diff --git a/public/themes/vela-blue/theme.css b/public/themes/vela-blue/theme.css
index 723e0fb74..2dd327d98 100644
--- a/public/themes/vela-blue/theme.css
+++ b/public/themes/vela-blue/theme.css
@@ -118,12 +118,12 @@
 }
 .p-autocomplete-panel.p-error > .p-inputtext, .p-autocomplete-panel.p-invalid > .p-inputtext {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-calendar.p-error > .p-inputtext, .p-calendar.p-invalid > .p-inputtext {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-datepicker {
@@ -296,14 +296,14 @@
 }
 
 .p-checkbox {
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
 }
 .p-checkbox .p-checkbox-box {
   border: 1px solid #2C3E50;
   background: #34495E;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #ebedef;
   border-radius: 3px;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -368,7 +368,7 @@
 }
 .p-chips.p-error > .p-inputtext, .p-chips.p-invalid > .p-inputtext {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-colorpicker-preview {
@@ -472,7 +472,7 @@
 }
 .p-dropdown-panel.p-error, .p-dropdown-panel.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-editor-container .p-editor-toolbar {
@@ -627,7 +627,7 @@
 }
 .p-inputswitch.p-error, .p-inputswitch.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-inputtext {
@@ -651,7 +651,7 @@
 }
 .p-inputtext.p-error, .p-inputtext.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-float-label label {
@@ -726,7 +726,7 @@
 }
 .p-listbox.p-error, .p-listbox.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-multiselect {
@@ -827,7 +827,7 @@
 }
 .p-multiselect-panel.p-error, .p-multiselect-panel.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-password-panel {
@@ -848,8 +848,8 @@
 .p-radiobutton .p-radiobutton-box {
   border: 1px solid #2C3E50;
   background: #34495E;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #ebedef;
   border-radius: 50%;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -864,13 +864,17 @@
   border-color: #64B5F6;
 }
 .p-radiobutton .p-radiobutton-box .p-radiobutton-icon {
-  font-size: 0.75rem;
+  width: 0.75rem;
+  height: 0.75rem;
   transition-duration: 0.2s;
+  border-radius: 50%;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight {
   border-color: #64B5F6;
   background: #64B5F6;
-  color: #212529;
+}
+.p-radiobutton .p-radiobutton-box.p-highlight .p-radiobutton-icon {
+  background-color: #212529;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight:not(.p-disabled):hover {
   border-color: #2196F3;
@@ -943,7 +947,7 @@
 }
 .p-selectbutton.p-error > .p-button, .p-selectbutton.p-invalid > .p-button {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-slider {
@@ -1023,7 +1027,7 @@
 }
 .p-togglebutton.p-button.p-error > .p-button, .p-togglebutton.p-button.p-invalid > .p-button {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-button {
@@ -1065,6 +1069,12 @@
 .p-button .p-badge {
   margin-left: 0.5rem;
 }
+.p-button.p-button-raised {
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
+}
+.p-button.p-button-rounded {
+  border-radius: 1rem;
+}
 .p-button.p-button-icon-only {
   width: 2.357rem;
 }
@@ -1072,11 +1082,8 @@
 .p-button.p-button-icon-only .p-button-icon-right {
   margin: 0;
 }
-.p-button.p-button-raised {
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
-}
-.p-button.p-button-rounded {
-  border-radius: 15px;
+.p-button.p-button-icon-only.p-button-rounded {
+  border-radius: 50%;
 }
 
 .p-fluid .p-button {
@@ -1299,9 +1306,9 @@
 }
 .p-datatable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #64B5F6;
   background: #212529;
   margin-left: 0.5rem;
@@ -1634,7 +1641,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1661,7 +1668,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1866,9 +1873,9 @@
 }
 .p-treetable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #64B5F6;
   background: #212529;
   margin-left: 0.5rem;
@@ -2337,7 +2344,7 @@
   border-bottom-left-radius: 3px;
 }
 .p-fileupload .p-progressbar {
-  height: 4px;
+  height: 0.25rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
@@ -2378,7 +2385,7 @@
 }
 
 .p-contextmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   color: #ebedef;
   border: 0 none;
@@ -2420,7 +2427,7 @@
   box-shadow: inset 0 0 0 0.15rem #BBDEFB;
 }
 .p-contextmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2436,7 +2443,7 @@
 }
 .p-contextmenu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-contextmenu .p-submenu-icon {
   font-size: 0.75rem;
@@ -2450,7 +2457,7 @@
   border-radius: 3px;
 }
 .p-megamenu .p-megamenu-root-list .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-megamenu .p-menuitem-link {
@@ -2503,12 +2510,12 @@
   border-top-left-radius: 3px;
 }
 .p-megamenu .p-megamenu-submenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   width: 12.5rem;
 }
 .p-megamenu .p-megamenu-submenu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-megamenu .p-menuitem.p-menuitem-active > .p-menuitem-link {
   background: #525e6b;
@@ -2521,11 +2528,11 @@
 }
 .p-megamenu.p-megamenu-vertical {
   width: 12.5rem;
-  padding: 4px 0;
+  padding: 0.25rem 0;
 }
 
 .p-menu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   color: #ebedef;
   border: 1px solid #3d4b59;
@@ -2581,7 +2588,7 @@
 }
 .p-menu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 
 .p-menubar {
@@ -2592,7 +2599,7 @@
   border-radius: 3px;
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-menubar .p-menuitem-link {
@@ -2630,7 +2637,7 @@
   box-shadow: inset 0 0 0 0.15rem #BBDEFB;
 }
 .p-menubar .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2638,7 +2645,7 @@
 }
 .p-menubar .p-submenu-list .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-menubar .p-submenu-list .p-submenu-icon {
   font-size: 0.75rem;
@@ -2694,7 +2701,7 @@
   color: #ebedef;
 }
 .p-panelmenu .p-panelmenu-content {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   border: 1px solid #283747;
   background: #283747;
   color: #ebedef;
@@ -2850,7 +2857,7 @@
 }
 
 .p-tieredmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   color: #ebedef;
   border: 1px solid #3d4b59;
@@ -2896,7 +2903,7 @@
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
 }
 .p-tieredmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2912,7 +2919,7 @@
 }
 .p-tieredmenu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-tieredmenu .p-submenu-icon {
   font-size: 0.75rem;
diff --git a/public/themes/vela-cyan/theme.css b/public/themes/vela-cyan/theme.css
index b0b05f043..1d00fd575 100644
--- a/public/themes/vela-cyan/theme.css
+++ b/public/themes/vela-cyan/theme.css
@@ -118,12 +118,12 @@
 }
 .p-autocomplete-panel.p-error > .p-inputtext, .p-autocomplete-panel.p-invalid > .p-inputtext {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-calendar.p-error > .p-inputtext, .p-calendar.p-invalid > .p-inputtext {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-datepicker {
@@ -296,14 +296,14 @@
 }
 
 .p-checkbox {
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
 }
 .p-checkbox .p-checkbox-box {
   border: 1px solid #2C3E50;
   background: #34495E;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #ebedef;
   border-radius: 3px;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -368,7 +368,7 @@
 }
 .p-chips.p-error > .p-inputtext, .p-chips.p-invalid > .p-inputtext {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-colorpicker-preview {
@@ -472,7 +472,7 @@
 }
 .p-dropdown-panel.p-error, .p-dropdown-panel.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-editor-container .p-editor-toolbar {
@@ -627,7 +627,7 @@
 }
 .p-inputswitch.p-error, .p-inputswitch.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-inputtext {
@@ -651,7 +651,7 @@
 }
 .p-inputtext.p-error, .p-inputtext.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-float-label label {
@@ -726,7 +726,7 @@
 }
 .p-listbox.p-error, .p-listbox.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-multiselect {
@@ -827,7 +827,7 @@
 }
 .p-multiselect-panel.p-error, .p-multiselect-panel.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-password-panel {
@@ -848,8 +848,8 @@
 .p-radiobutton .p-radiobutton-box {
   border: 1px solid #2C3E50;
   background: #34495E;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #ebedef;
   border-radius: 50%;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -864,13 +864,17 @@
   border-color: #4DD0E1;
 }
 .p-radiobutton .p-radiobutton-box .p-radiobutton-icon {
-  font-size: 0.75rem;
+  width: 0.75rem;
+  height: 0.75rem;
   transition-duration: 0.2s;
+  border-radius: 50%;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight {
   border-color: #4DD0E1;
   background: #4DD0E1;
-  color: #212529;
+}
+.p-radiobutton .p-radiobutton-box.p-highlight .p-radiobutton-icon {
+  background-color: #212529;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight:not(.p-disabled):hover {
   border-color: #00BCD4;
@@ -943,7 +947,7 @@
 }
 .p-selectbutton.p-error > .p-button, .p-selectbutton.p-invalid > .p-button {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-slider {
@@ -1023,7 +1027,7 @@
 }
 .p-togglebutton.p-button.p-error > .p-button, .p-togglebutton.p-button.p-invalid > .p-button {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-button {
@@ -1065,6 +1069,12 @@
 .p-button .p-badge {
   margin-left: 0.5rem;
 }
+.p-button.p-button-raised {
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
+}
+.p-button.p-button-rounded {
+  border-radius: 1rem;
+}
 .p-button.p-button-icon-only {
   width: 2.357rem;
 }
@@ -1072,11 +1082,8 @@
 .p-button.p-button-icon-only .p-button-icon-right {
   margin: 0;
 }
-.p-button.p-button-raised {
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
-}
-.p-button.p-button-rounded {
-  border-radius: 15px;
+.p-button.p-button-icon-only.p-button-rounded {
+  border-radius: 50%;
 }
 
 .p-fluid .p-button {
@@ -1299,9 +1306,9 @@
 }
 .p-datatable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #4DD0E1;
   background: #212529;
   margin-left: 0.5rem;
@@ -1634,7 +1641,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1661,7 +1668,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1866,9 +1873,9 @@
 }
 .p-treetable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #4DD0E1;
   background: #212529;
   margin-left: 0.5rem;
@@ -2337,7 +2344,7 @@
   border-bottom-left-radius: 3px;
 }
 .p-fileupload .p-progressbar {
-  height: 4px;
+  height: 0.25rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
@@ -2378,7 +2385,7 @@
 }
 
 .p-contextmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   color: #ebedef;
   border: 0 none;
@@ -2420,7 +2427,7 @@
   box-shadow: inset 0 0 0 0.15rem #B2EBF2;
 }
 .p-contextmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2436,7 +2443,7 @@
 }
 .p-contextmenu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-contextmenu .p-submenu-icon {
   font-size: 0.75rem;
@@ -2450,7 +2457,7 @@
   border-radius: 3px;
 }
 .p-megamenu .p-megamenu-root-list .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-megamenu .p-menuitem-link {
@@ -2503,12 +2510,12 @@
   border-top-left-radius: 3px;
 }
 .p-megamenu .p-megamenu-submenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   width: 12.5rem;
 }
 .p-megamenu .p-megamenu-submenu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-megamenu .p-menuitem.p-menuitem-active > .p-menuitem-link {
   background: #525e6b;
@@ -2521,11 +2528,11 @@
 }
 .p-megamenu.p-megamenu-vertical {
   width: 12.5rem;
-  padding: 4px 0;
+  padding: 0.25rem 0;
 }
 
 .p-menu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   color: #ebedef;
   border: 1px solid #3d4b59;
@@ -2581,7 +2588,7 @@
 }
 .p-menu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 
 .p-menubar {
@@ -2592,7 +2599,7 @@
   border-radius: 3px;
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-menubar .p-menuitem-link {
@@ -2630,7 +2637,7 @@
   box-shadow: inset 0 0 0 0.15rem #B2EBF2;
 }
 .p-menubar .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2638,7 +2645,7 @@
 }
 .p-menubar .p-submenu-list .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-menubar .p-submenu-list .p-submenu-icon {
   font-size: 0.75rem;
@@ -2694,7 +2701,7 @@
   color: #ebedef;
 }
 .p-panelmenu .p-panelmenu-content {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   border: 1px solid #283747;
   background: #283747;
   color: #ebedef;
@@ -2850,7 +2857,7 @@
 }
 
 .p-tieredmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   color: #ebedef;
   border: 1px solid #3d4b59;
@@ -2896,7 +2903,7 @@
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
 }
 .p-tieredmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2912,7 +2919,7 @@
 }
 .p-tieredmenu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-tieredmenu .p-submenu-icon {
   font-size: 0.75rem;
diff --git a/public/themes/vela-deeppurple/theme.css b/public/themes/vela-deeppurple/theme.css
index 696a84a3a..de035185f 100644
--- a/public/themes/vela-deeppurple/theme.css
+++ b/public/themes/vela-deeppurple/theme.css
@@ -118,12 +118,12 @@
 }
 .p-autocomplete-panel.p-error > .p-inputtext, .p-autocomplete-panel.p-invalid > .p-inputtext {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-calendar.p-error > .p-inputtext, .p-calendar.p-invalid > .p-inputtext {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-datepicker {
@@ -296,14 +296,14 @@
 }
 
 .p-checkbox {
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
 }
 .p-checkbox .p-checkbox-box {
   border: 1px solid #2C3E50;
   background: #34495E;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #ebedef;
   border-radius: 3px;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -368,7 +368,7 @@
 }
 .p-chips.p-error > .p-inputtext, .p-chips.p-invalid > .p-inputtext {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-colorpicker-preview {
@@ -472,7 +472,7 @@
 }
 .p-dropdown-panel.p-error, .p-dropdown-panel.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-editor-container .p-editor-toolbar {
@@ -627,7 +627,7 @@
 }
 .p-inputswitch.p-error, .p-inputswitch.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-inputtext {
@@ -651,7 +651,7 @@
 }
 .p-inputtext.p-error, .p-inputtext.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-float-label label {
@@ -726,7 +726,7 @@
 }
 .p-listbox.p-error, .p-listbox.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-multiselect {
@@ -827,7 +827,7 @@
 }
 .p-multiselect-panel.p-error, .p-multiselect-panel.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-password-panel {
@@ -848,8 +848,8 @@
 .p-radiobutton .p-radiobutton-box {
   border: 1px solid #2C3E50;
   background: #34495E;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #ebedef;
   border-radius: 50%;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -864,13 +864,17 @@
   border-color: #9575CD;
 }
 .p-radiobutton .p-radiobutton-box .p-radiobutton-icon {
-  font-size: 0.75rem;
+  width: 0.75rem;
+  height: 0.75rem;
   transition-duration: 0.2s;
+  border-radius: 50%;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight {
   border-color: #9575CD;
   background: #9575CD;
-  color: #ffffff;
+}
+.p-radiobutton .p-radiobutton-box.p-highlight .p-radiobutton-icon {
+  background-color: #ffffff;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight:not(.p-disabled):hover {
   border-color: #673AB7;
@@ -943,7 +947,7 @@
 }
 .p-selectbutton.p-error > .p-button, .p-selectbutton.p-invalid > .p-button {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-slider {
@@ -1023,7 +1027,7 @@
 }
 .p-togglebutton.p-button.p-error > .p-button, .p-togglebutton.p-button.p-invalid > .p-button {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-button {
@@ -1065,6 +1069,12 @@
 .p-button .p-badge {
   margin-left: 0.5rem;
 }
+.p-button.p-button-raised {
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
+}
+.p-button.p-button-rounded {
+  border-radius: 1rem;
+}
 .p-button.p-button-icon-only {
   width: 2.357rem;
 }
@@ -1072,11 +1082,8 @@
 .p-button.p-button-icon-only .p-button-icon-right {
   margin: 0;
 }
-.p-button.p-button-raised {
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
-}
-.p-button.p-button-rounded {
-  border-radius: 15px;
+.p-button.p-button-icon-only.p-button-rounded {
+  border-radius: 50%;
 }
 
 .p-fluid .p-button {
@@ -1299,9 +1306,9 @@
 }
 .p-datatable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #9575CD;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -1634,7 +1641,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1661,7 +1668,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1866,9 +1873,9 @@
 }
 .p-treetable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #9575CD;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -2337,7 +2344,7 @@
   border-bottom-left-radius: 3px;
 }
 .p-fileupload .p-progressbar {
-  height: 4px;
+  height: 0.25rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
@@ -2378,7 +2385,7 @@
 }
 
 .p-contextmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   color: #ebedef;
   border: 0 none;
@@ -2420,7 +2427,7 @@
   box-shadow: inset 0 0 0 0.15rem #D1C4E9;
 }
 .p-contextmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2436,7 +2443,7 @@
 }
 .p-contextmenu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-contextmenu .p-submenu-icon {
   font-size: 0.75rem;
@@ -2450,7 +2457,7 @@
   border-radius: 3px;
 }
 .p-megamenu .p-megamenu-root-list .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-megamenu .p-menuitem-link {
@@ -2503,12 +2510,12 @@
   border-top-left-radius: 3px;
 }
 .p-megamenu .p-megamenu-submenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   width: 12.5rem;
 }
 .p-megamenu .p-megamenu-submenu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-megamenu .p-menuitem.p-menuitem-active > .p-menuitem-link {
   background: #525e6b;
@@ -2521,11 +2528,11 @@
 }
 .p-megamenu.p-megamenu-vertical {
   width: 12.5rem;
-  padding: 4px 0;
+  padding: 0.25rem 0;
 }
 
 .p-menu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   color: #ebedef;
   border: 1px solid #3d4b59;
@@ -2581,7 +2588,7 @@
 }
 .p-menu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 
 .p-menubar {
@@ -2592,7 +2599,7 @@
   border-radius: 3px;
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-menubar .p-menuitem-link {
@@ -2630,7 +2637,7 @@
   box-shadow: inset 0 0 0 0.15rem #D1C4E9;
 }
 .p-menubar .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2638,7 +2645,7 @@
 }
 .p-menubar .p-submenu-list .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-menubar .p-submenu-list .p-submenu-icon {
   font-size: 0.75rem;
@@ -2694,7 +2701,7 @@
   color: #ebedef;
 }
 .p-panelmenu .p-panelmenu-content {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   border: 1px solid #283747;
   background: #283747;
   color: #ebedef;
@@ -2850,7 +2857,7 @@
 }
 
 .p-tieredmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   color: #ebedef;
   border: 1px solid #3d4b59;
@@ -2896,7 +2903,7 @@
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
 }
 .p-tieredmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2912,7 +2919,7 @@
 }
 .p-tieredmenu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-tieredmenu .p-submenu-icon {
   font-size: 0.75rem;
diff --git a/public/themes/vela-green/theme.css b/public/themes/vela-green/theme.css
index a7f75997b..b33817c6b 100644
--- a/public/themes/vela-green/theme.css
+++ b/public/themes/vela-green/theme.css
@@ -118,12 +118,12 @@
 }
 .p-autocomplete-panel.p-error > .p-inputtext, .p-autocomplete-panel.p-invalid > .p-inputtext {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-calendar.p-error > .p-inputtext, .p-calendar.p-invalid > .p-inputtext {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-datepicker {
@@ -296,14 +296,14 @@
 }
 
 .p-checkbox {
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
 }
 .p-checkbox .p-checkbox-box {
   border: 1px solid #2C3E50;
   background: #34495E;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #ebedef;
   border-radius: 3px;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -368,7 +368,7 @@
 }
 .p-chips.p-error > .p-inputtext, .p-chips.p-invalid > .p-inputtext {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-colorpicker-preview {
@@ -472,7 +472,7 @@
 }
 .p-dropdown-panel.p-error, .p-dropdown-panel.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-editor-container .p-editor-toolbar {
@@ -627,7 +627,7 @@
 }
 .p-inputswitch.p-error, .p-inputswitch.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-inputtext {
@@ -651,7 +651,7 @@
 }
 .p-inputtext.p-error, .p-inputtext.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-float-label label {
@@ -726,7 +726,7 @@
 }
 .p-listbox.p-error, .p-listbox.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-multiselect {
@@ -827,7 +827,7 @@
 }
 .p-multiselect-panel.p-error, .p-multiselect-panel.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-password-panel {
@@ -848,8 +848,8 @@
 .p-radiobutton .p-radiobutton-box {
   border: 1px solid #2C3E50;
   background: #34495E;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #ebedef;
   border-radius: 50%;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -864,13 +864,17 @@
   border-color: #81C784;
 }
 .p-radiobutton .p-radiobutton-box .p-radiobutton-icon {
-  font-size: 0.75rem;
+  width: 0.75rem;
+  height: 0.75rem;
   transition-duration: 0.2s;
+  border-radius: 50%;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight {
   border-color: #81C784;
   background: #81C784;
-  color: #212529;
+}
+.p-radiobutton .p-radiobutton-box.p-highlight .p-radiobutton-icon {
+  background-color: #212529;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight:not(.p-disabled):hover {
   border-color: #4CAF50;
@@ -943,7 +947,7 @@
 }
 .p-selectbutton.p-error > .p-button, .p-selectbutton.p-invalid > .p-button {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-slider {
@@ -1023,7 +1027,7 @@
 }
 .p-togglebutton.p-button.p-error > .p-button, .p-togglebutton.p-button.p-invalid > .p-button {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-button {
@@ -1065,6 +1069,12 @@
 .p-button .p-badge {
   margin-left: 0.5rem;
 }
+.p-button.p-button-raised {
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
+}
+.p-button.p-button-rounded {
+  border-radius: 1rem;
+}
 .p-button.p-button-icon-only {
   width: 2.357rem;
 }
@@ -1072,11 +1082,8 @@
 .p-button.p-button-icon-only .p-button-icon-right {
   margin: 0;
 }
-.p-button.p-button-raised {
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
-}
-.p-button.p-button-rounded {
-  border-radius: 15px;
+.p-button.p-button-icon-only.p-button-rounded {
+  border-radius: 50%;
 }
 
 .p-fluid .p-button {
@@ -1299,9 +1306,9 @@
 }
 .p-datatable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #81C784;
   background: #212529;
   margin-left: 0.5rem;
@@ -1634,7 +1641,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1661,7 +1668,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1866,9 +1873,9 @@
 }
 .p-treetable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #81C784;
   background: #212529;
   margin-left: 0.5rem;
@@ -2337,7 +2344,7 @@
   border-bottom-left-radius: 3px;
 }
 .p-fileupload .p-progressbar {
-  height: 4px;
+  height: 0.25rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
@@ -2378,7 +2385,7 @@
 }
 
 .p-contextmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   color: #ebedef;
   border: 0 none;
@@ -2420,7 +2427,7 @@
   box-shadow: inset 0 0 0 0.15rem #C8E6C9;
 }
 .p-contextmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2436,7 +2443,7 @@
 }
 .p-contextmenu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-contextmenu .p-submenu-icon {
   font-size: 0.75rem;
@@ -2450,7 +2457,7 @@
   border-radius: 3px;
 }
 .p-megamenu .p-megamenu-root-list .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-megamenu .p-menuitem-link {
@@ -2503,12 +2510,12 @@
   border-top-left-radius: 3px;
 }
 .p-megamenu .p-megamenu-submenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   width: 12.5rem;
 }
 .p-megamenu .p-megamenu-submenu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-megamenu .p-menuitem.p-menuitem-active > .p-menuitem-link {
   background: #525e6b;
@@ -2521,11 +2528,11 @@
 }
 .p-megamenu.p-megamenu-vertical {
   width: 12.5rem;
-  padding: 4px 0;
+  padding: 0.25rem 0;
 }
 
 .p-menu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   color: #ebedef;
   border: 1px solid #3d4b59;
@@ -2581,7 +2588,7 @@
 }
 .p-menu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 
 .p-menubar {
@@ -2592,7 +2599,7 @@
   border-radius: 3px;
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-menubar .p-menuitem-link {
@@ -2630,7 +2637,7 @@
   box-shadow: inset 0 0 0 0.15rem #C8E6C9;
 }
 .p-menubar .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2638,7 +2645,7 @@
 }
 .p-menubar .p-submenu-list .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-menubar .p-submenu-list .p-submenu-icon {
   font-size: 0.75rem;
@@ -2694,7 +2701,7 @@
   color: #ebedef;
 }
 .p-panelmenu .p-panelmenu-content {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   border: 1px solid #283747;
   background: #283747;
   color: #ebedef;
@@ -2850,7 +2857,7 @@
 }
 
 .p-tieredmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   color: #ebedef;
   border: 1px solid #3d4b59;
@@ -2896,7 +2903,7 @@
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
 }
 .p-tieredmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2912,7 +2919,7 @@
 }
 .p-tieredmenu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-tieredmenu .p-submenu-icon {
   font-size: 0.75rem;
diff --git a/public/themes/vela-indigo/theme.css b/public/themes/vela-indigo/theme.css
index 534dbdcde..30dde9414 100644
--- a/public/themes/vela-indigo/theme.css
+++ b/public/themes/vela-indigo/theme.css
@@ -118,12 +118,12 @@
 }
 .p-autocomplete-panel.p-error > .p-inputtext, .p-autocomplete-panel.p-invalid > .p-inputtext {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-calendar.p-error > .p-inputtext, .p-calendar.p-invalid > .p-inputtext {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-datepicker {
@@ -296,14 +296,14 @@
 }
 
 .p-checkbox {
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
 }
 .p-checkbox .p-checkbox-box {
   border: 1px solid #2C3E50;
   background: #34495E;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #ebedef;
   border-radius: 3px;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -368,7 +368,7 @@
 }
 .p-chips.p-error > .p-inputtext, .p-chips.p-invalid > .p-inputtext {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-colorpicker-preview {
@@ -472,7 +472,7 @@
 }
 .p-dropdown-panel.p-error, .p-dropdown-panel.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-editor-container .p-editor-toolbar {
@@ -627,7 +627,7 @@
 }
 .p-inputswitch.p-error, .p-inputswitch.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-inputtext {
@@ -651,7 +651,7 @@
 }
 .p-inputtext.p-error, .p-inputtext.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-float-label label {
@@ -726,7 +726,7 @@
 }
 .p-listbox.p-error, .p-listbox.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-multiselect {
@@ -827,7 +827,7 @@
 }
 .p-multiselect-panel.p-error, .p-multiselect-panel.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-password-panel {
@@ -848,8 +848,8 @@
 .p-radiobutton .p-radiobutton-box {
   border: 1px solid #2C3E50;
   background: #34495E;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #ebedef;
   border-radius: 50%;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -864,13 +864,17 @@
   border-color: #7986CB;
 }
 .p-radiobutton .p-radiobutton-box .p-radiobutton-icon {
-  font-size: 0.75rem;
+  width: 0.75rem;
+  height: 0.75rem;
   transition-duration: 0.2s;
+  border-radius: 50%;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight {
   border-color: #7986CB;
   background: #7986CB;
-  color: #ffffff;
+}
+.p-radiobutton .p-radiobutton-box.p-highlight .p-radiobutton-icon {
+  background-color: #ffffff;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight:not(.p-disabled):hover {
   border-color: #3F51B5;
@@ -943,7 +947,7 @@
 }
 .p-selectbutton.p-error > .p-button, .p-selectbutton.p-invalid > .p-button {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-slider {
@@ -1023,7 +1027,7 @@
 }
 .p-togglebutton.p-button.p-error > .p-button, .p-togglebutton.p-button.p-invalid > .p-button {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-button {
@@ -1065,6 +1069,12 @@
 .p-button .p-badge {
   margin-left: 0.5rem;
 }
+.p-button.p-button-raised {
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
+}
+.p-button.p-button-rounded {
+  border-radius: 1rem;
+}
 .p-button.p-button-icon-only {
   width: 2.357rem;
 }
@@ -1072,11 +1082,8 @@
 .p-button.p-button-icon-only .p-button-icon-right {
   margin: 0;
 }
-.p-button.p-button-raised {
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
-}
-.p-button.p-button-rounded {
-  border-radius: 15px;
+.p-button.p-button-icon-only.p-button-rounded {
+  border-radius: 50%;
 }
 
 .p-fluid .p-button {
@@ -1299,9 +1306,9 @@
 }
 .p-datatable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #7986CB;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -1634,7 +1641,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1661,7 +1668,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1866,9 +1873,9 @@
 }
 .p-treetable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #7986CB;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -2337,7 +2344,7 @@
   border-bottom-left-radius: 3px;
 }
 .p-fileupload .p-progressbar {
-  height: 4px;
+  height: 0.25rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
@@ -2378,7 +2385,7 @@
 }
 
 .p-contextmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   color: #ebedef;
   border: 0 none;
@@ -2420,7 +2427,7 @@
   box-shadow: inset 0 0 0 0.15rem #C5CAE9;
 }
 .p-contextmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2436,7 +2443,7 @@
 }
 .p-contextmenu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-contextmenu .p-submenu-icon {
   font-size: 0.75rem;
@@ -2450,7 +2457,7 @@
   border-radius: 3px;
 }
 .p-megamenu .p-megamenu-root-list .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-megamenu .p-menuitem-link {
@@ -2503,12 +2510,12 @@
   border-top-left-radius: 3px;
 }
 .p-megamenu .p-megamenu-submenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   width: 12.5rem;
 }
 .p-megamenu .p-megamenu-submenu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-megamenu .p-menuitem.p-menuitem-active > .p-menuitem-link {
   background: #525e6b;
@@ -2521,11 +2528,11 @@
 }
 .p-megamenu.p-megamenu-vertical {
   width: 12.5rem;
-  padding: 4px 0;
+  padding: 0.25rem 0;
 }
 
 .p-menu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   color: #ebedef;
   border: 1px solid #3d4b59;
@@ -2581,7 +2588,7 @@
 }
 .p-menu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 
 .p-menubar {
@@ -2592,7 +2599,7 @@
   border-radius: 3px;
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-menubar .p-menuitem-link {
@@ -2630,7 +2637,7 @@
   box-shadow: inset 0 0 0 0.15rem #C5CAE9;
 }
 .p-menubar .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2638,7 +2645,7 @@
 }
 .p-menubar .p-submenu-list .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-menubar .p-submenu-list .p-submenu-icon {
   font-size: 0.75rem;
@@ -2694,7 +2701,7 @@
   color: #ebedef;
 }
 .p-panelmenu .p-panelmenu-content {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   border: 1px solid #283747;
   background: #283747;
   color: #ebedef;
@@ -2850,7 +2857,7 @@
 }
 
 .p-tieredmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   color: #ebedef;
   border: 1px solid #3d4b59;
@@ -2896,7 +2903,7 @@
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
 }
 .p-tieredmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2912,7 +2919,7 @@
 }
 .p-tieredmenu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-tieredmenu .p-submenu-icon {
   font-size: 0.75rem;
diff --git a/public/themes/vela-orange/theme.css b/public/themes/vela-orange/theme.css
index 88ee3e802..b64874e65 100644
--- a/public/themes/vela-orange/theme.css
+++ b/public/themes/vela-orange/theme.css
@@ -118,12 +118,12 @@
 }
 .p-autocomplete-panel.p-error > .p-inputtext, .p-autocomplete-panel.p-invalid > .p-inputtext {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-calendar.p-error > .p-inputtext, .p-calendar.p-invalid > .p-inputtext {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-datepicker {
@@ -296,14 +296,14 @@
 }
 
 .p-checkbox {
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
 }
 .p-checkbox .p-checkbox-box {
   border: 1px solid #2C3E50;
   background: #34495E;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #ebedef;
   border-radius: 3px;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -368,7 +368,7 @@
 }
 .p-chips.p-error > .p-inputtext, .p-chips.p-invalid > .p-inputtext {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-colorpicker-preview {
@@ -472,7 +472,7 @@
 }
 .p-dropdown-panel.p-error, .p-dropdown-panel.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-editor-container .p-editor-toolbar {
@@ -627,7 +627,7 @@
 }
 .p-inputswitch.p-error, .p-inputswitch.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-inputtext {
@@ -651,7 +651,7 @@
 }
 .p-inputtext.p-error, .p-inputtext.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-float-label label {
@@ -726,7 +726,7 @@
 }
 .p-listbox.p-error, .p-listbox.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-multiselect {
@@ -827,7 +827,7 @@
 }
 .p-multiselect-panel.p-error, .p-multiselect-panel.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-password-panel {
@@ -848,8 +848,8 @@
 .p-radiobutton .p-radiobutton-box {
   border: 1px solid #2C3E50;
   background: #34495E;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #ebedef;
   border-radius: 50%;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -864,13 +864,17 @@
   border-color: #FFD54F;
 }
 .p-radiobutton .p-radiobutton-box .p-radiobutton-icon {
-  font-size: 0.75rem;
+  width: 0.75rem;
+  height: 0.75rem;
   transition-duration: 0.2s;
+  border-radius: 50%;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight {
   border-color: #FFD54F;
   background: #FFD54F;
-  color: #212529;
+}
+.p-radiobutton .p-radiobutton-box.p-highlight .p-radiobutton-icon {
+  background-color: #212529;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight:not(.p-disabled):hover {
   border-color: #FFC107;
@@ -943,7 +947,7 @@
 }
 .p-selectbutton.p-error > .p-button, .p-selectbutton.p-invalid > .p-button {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-slider {
@@ -1023,7 +1027,7 @@
 }
 .p-togglebutton.p-button.p-error > .p-button, .p-togglebutton.p-button.p-invalid > .p-button {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-button {
@@ -1065,6 +1069,12 @@
 .p-button .p-badge {
   margin-left: 0.5rem;
 }
+.p-button.p-button-raised {
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
+}
+.p-button.p-button-rounded {
+  border-radius: 1rem;
+}
 .p-button.p-button-icon-only {
   width: 2.357rem;
 }
@@ -1072,11 +1082,8 @@
 .p-button.p-button-icon-only .p-button-icon-right {
   margin: 0;
 }
-.p-button.p-button-raised {
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
-}
-.p-button.p-button-rounded {
-  border-radius: 15px;
+.p-button.p-button-icon-only.p-button-rounded {
+  border-radius: 50%;
 }
 
 .p-fluid .p-button {
@@ -1299,9 +1306,9 @@
 }
 .p-datatable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #FFD54F;
   background: #212529;
   margin-left: 0.5rem;
@@ -1634,7 +1641,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1661,7 +1668,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1866,9 +1873,9 @@
 }
 .p-treetable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #FFD54F;
   background: #212529;
   margin-left: 0.5rem;
@@ -2337,7 +2344,7 @@
   border-bottom-left-radius: 3px;
 }
 .p-fileupload .p-progressbar {
-  height: 4px;
+  height: 0.25rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
@@ -2378,7 +2385,7 @@
 }
 
 .p-contextmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   color: #ebedef;
   border: 0 none;
@@ -2420,7 +2427,7 @@
   box-shadow: inset 0 0 0 0.15rem #FFECB3;
 }
 .p-contextmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2436,7 +2443,7 @@
 }
 .p-contextmenu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-contextmenu .p-submenu-icon {
   font-size: 0.75rem;
@@ -2450,7 +2457,7 @@
   border-radius: 3px;
 }
 .p-megamenu .p-megamenu-root-list .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-megamenu .p-menuitem-link {
@@ -2503,12 +2510,12 @@
   border-top-left-radius: 3px;
 }
 .p-megamenu .p-megamenu-submenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   width: 12.5rem;
 }
 .p-megamenu .p-megamenu-submenu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-megamenu .p-menuitem.p-menuitem-active > .p-menuitem-link {
   background: #525e6b;
@@ -2521,11 +2528,11 @@
 }
 .p-megamenu.p-megamenu-vertical {
   width: 12.5rem;
-  padding: 4px 0;
+  padding: 0.25rem 0;
 }
 
 .p-menu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   color: #ebedef;
   border: 1px solid #3d4b59;
@@ -2581,7 +2588,7 @@
 }
 .p-menu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 
 .p-menubar {
@@ -2592,7 +2599,7 @@
   border-radius: 3px;
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-menubar .p-menuitem-link {
@@ -2630,7 +2637,7 @@
   box-shadow: inset 0 0 0 0.15rem #FFECB3;
 }
 .p-menubar .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2638,7 +2645,7 @@
 }
 .p-menubar .p-submenu-list .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-menubar .p-submenu-list .p-submenu-icon {
   font-size: 0.75rem;
@@ -2694,7 +2701,7 @@
   color: #ebedef;
 }
 .p-panelmenu .p-panelmenu-content {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   border: 1px solid #283747;
   background: #283747;
   color: #ebedef;
@@ -2850,7 +2857,7 @@
 }
 
 .p-tieredmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   color: #ebedef;
   border: 1px solid #3d4b59;
@@ -2896,7 +2903,7 @@
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
 }
 .p-tieredmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2912,7 +2919,7 @@
 }
 .p-tieredmenu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-tieredmenu .p-submenu-icon {
   font-size: 0.75rem;
diff --git a/public/themes/vela-purple/theme.css b/public/themes/vela-purple/theme.css
index 5fef7fd50..20c7cf65d 100644
--- a/public/themes/vela-purple/theme.css
+++ b/public/themes/vela-purple/theme.css
@@ -118,12 +118,12 @@
 }
 .p-autocomplete-panel.p-error > .p-inputtext, .p-autocomplete-panel.p-invalid > .p-inputtext {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-calendar.p-error > .p-inputtext, .p-calendar.p-invalid > .p-inputtext {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-datepicker {
@@ -296,14 +296,14 @@
 }
 
 .p-checkbox {
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
 }
 .p-checkbox .p-checkbox-box {
   border: 1px solid #2C3E50;
   background: #34495E;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #ebedef;
   border-radius: 3px;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -368,7 +368,7 @@
 }
 .p-chips.p-error > .p-inputtext, .p-chips.p-invalid > .p-inputtext {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-colorpicker-preview {
@@ -472,7 +472,7 @@
 }
 .p-dropdown-panel.p-error, .p-dropdown-panel.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-editor-container .p-editor-toolbar {
@@ -627,7 +627,7 @@
 }
 .p-inputswitch.p-error, .p-inputswitch.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-inputtext {
@@ -651,7 +651,7 @@
 }
 .p-inputtext.p-error, .p-inputtext.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-float-label label {
@@ -726,7 +726,7 @@
 }
 .p-listbox.p-error, .p-listbox.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-multiselect {
@@ -827,7 +827,7 @@
 }
 .p-multiselect-panel.p-error, .p-multiselect-panel.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-password-panel {
@@ -848,8 +848,8 @@
 .p-radiobutton .p-radiobutton-box {
   border: 1px solid #2C3E50;
   background: #34495E;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #ebedef;
   border-radius: 50%;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -864,13 +864,17 @@
   border-color: #BA68C8;
 }
 .p-radiobutton .p-radiobutton-box .p-radiobutton-icon {
-  font-size: 0.75rem;
+  width: 0.75rem;
+  height: 0.75rem;
   transition-duration: 0.2s;
+  border-radius: 50%;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight {
   border-color: #BA68C8;
   background: #BA68C8;
-  color: #ffffff;
+}
+.p-radiobutton .p-radiobutton-box.p-highlight .p-radiobutton-icon {
+  background-color: #ffffff;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight:not(.p-disabled):hover {
   border-color: #9C27B0;
@@ -943,7 +947,7 @@
 }
 .p-selectbutton.p-error > .p-button, .p-selectbutton.p-invalid > .p-button {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-slider {
@@ -1023,7 +1027,7 @@
 }
 .p-togglebutton.p-button.p-error > .p-button, .p-togglebutton.p-button.p-invalid > .p-button {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-button {
@@ -1065,6 +1069,12 @@
 .p-button .p-badge {
   margin-left: 0.5rem;
 }
+.p-button.p-button-raised {
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
+}
+.p-button.p-button-rounded {
+  border-radius: 1rem;
+}
 .p-button.p-button-icon-only {
   width: 2.357rem;
 }
@@ -1072,11 +1082,8 @@
 .p-button.p-button-icon-only .p-button-icon-right {
   margin: 0;
 }
-.p-button.p-button-raised {
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
-}
-.p-button.p-button-rounded {
-  border-radius: 15px;
+.p-button.p-button-icon-only.p-button-rounded {
+  border-radius: 50%;
 }
 
 .p-fluid .p-button {
@@ -1299,9 +1306,9 @@
 }
 .p-datatable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #BA68C8;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -1634,7 +1641,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1661,7 +1668,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1866,9 +1873,9 @@
 }
 .p-treetable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #BA68C8;
   background: #ffffff;
   margin-left: 0.5rem;
@@ -2337,7 +2344,7 @@
   border-bottom-left-radius: 3px;
 }
 .p-fileupload .p-progressbar {
-  height: 4px;
+  height: 0.25rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
@@ -2378,7 +2385,7 @@
 }
 
 .p-contextmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   color: #ebedef;
   border: 0 none;
@@ -2420,7 +2427,7 @@
   box-shadow: inset 0 0 0 0.15rem #E1BEE7;
 }
 .p-contextmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2436,7 +2443,7 @@
 }
 .p-contextmenu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-contextmenu .p-submenu-icon {
   font-size: 0.75rem;
@@ -2450,7 +2457,7 @@
   border-radius: 3px;
 }
 .p-megamenu .p-megamenu-root-list .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-megamenu .p-menuitem-link {
@@ -2503,12 +2510,12 @@
   border-top-left-radius: 3px;
 }
 .p-megamenu .p-megamenu-submenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   width: 12.5rem;
 }
 .p-megamenu .p-megamenu-submenu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-megamenu .p-menuitem.p-menuitem-active > .p-menuitem-link {
   background: #525e6b;
@@ -2521,11 +2528,11 @@
 }
 .p-megamenu.p-megamenu-vertical {
   width: 12.5rem;
-  padding: 4px 0;
+  padding: 0.25rem 0;
 }
 
 .p-menu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   color: #ebedef;
   border: 1px solid #3d4b59;
@@ -2581,7 +2588,7 @@
 }
 .p-menu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 
 .p-menubar {
@@ -2592,7 +2599,7 @@
   border-radius: 3px;
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-menubar .p-menuitem-link {
@@ -2630,7 +2637,7 @@
   box-shadow: inset 0 0 0 0.15rem #E1BEE7;
 }
 .p-menubar .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2638,7 +2645,7 @@
 }
 .p-menubar .p-submenu-list .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-menubar .p-submenu-list .p-submenu-icon {
   font-size: 0.75rem;
@@ -2694,7 +2701,7 @@
   color: #ebedef;
 }
 .p-panelmenu .p-panelmenu-content {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   border: 1px solid #283747;
   background: #283747;
   color: #ebedef;
@@ -2850,7 +2857,7 @@
 }
 
 .p-tieredmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   color: #ebedef;
   border: 1px solid #3d4b59;
@@ -2896,7 +2903,7 @@
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
 }
 .p-tieredmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2912,7 +2919,7 @@
 }
 .p-tieredmenu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-tieredmenu .p-submenu-icon {
   font-size: 0.75rem;
diff --git a/public/themes/vela-teal/theme.css b/public/themes/vela-teal/theme.css
index 43afba4f9..b42b37a52 100644
--- a/public/themes/vela-teal/theme.css
+++ b/public/themes/vela-teal/theme.css
@@ -118,12 +118,12 @@
 }
 .p-autocomplete-panel.p-error > .p-inputtext, .p-autocomplete-panel.p-invalid > .p-inputtext {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-calendar.p-error > .p-inputtext, .p-calendar.p-invalid > .p-inputtext {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-datepicker {
@@ -296,14 +296,14 @@
 }
 
 .p-checkbox {
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
 }
 .p-checkbox .p-checkbox-box {
   border: 1px solid #2C3E50;
   background: #34495E;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #ebedef;
   border-radius: 3px;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -368,7 +368,7 @@
 }
 .p-chips.p-error > .p-inputtext, .p-chips.p-invalid > .p-inputtext {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-colorpicker-preview {
@@ -472,7 +472,7 @@
 }
 .p-dropdown-panel.p-error, .p-dropdown-panel.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-editor-container .p-editor-toolbar {
@@ -627,7 +627,7 @@
 }
 .p-inputswitch.p-error, .p-inputswitch.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-inputtext {
@@ -651,7 +651,7 @@
 }
 .p-inputtext.p-error, .p-inputtext.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-float-label label {
@@ -726,7 +726,7 @@
 }
 .p-listbox.p-error, .p-listbox.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-multiselect {
@@ -827,7 +827,7 @@
 }
 .p-multiselect-panel.p-error, .p-multiselect-panel.p-invalid {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-password-panel {
@@ -848,8 +848,8 @@
 .p-radiobutton .p-radiobutton-box {
   border: 1px solid #2C3E50;
   background: #34495E;
-  width: 20px;
-  height: 20px;
+  width: 1.5rem;
+  height: 1.5rem;
   color: #ebedef;
   border-radius: 50%;
   transition: background-color 0.2s, border-color 0.2s, box-shadow 0.2s;
@@ -864,13 +864,17 @@
   border-color: #4DB6AC;
 }
 .p-radiobutton .p-radiobutton-box .p-radiobutton-icon {
-  font-size: 0.75rem;
+  width: 0.75rem;
+  height: 0.75rem;
   transition-duration: 0.2s;
+  border-radius: 50%;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight {
   border-color: #4DB6AC;
   background: #4DB6AC;
-  color: #212529;
+}
+.p-radiobutton .p-radiobutton-box.p-highlight .p-radiobutton-icon {
+  background-color: #212529;
 }
 .p-radiobutton .p-radiobutton-box.p-highlight:not(.p-disabled):hover {
   border-color: #009688;
@@ -943,7 +947,7 @@
 }
 .p-selectbutton.p-error > .p-button, .p-selectbutton.p-invalid > .p-button {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-slider {
@@ -1023,7 +1027,7 @@
 }
 .p-togglebutton.p-button.p-error > .p-button, .p-togglebutton.p-button.p-invalid > .p-button {
   border-color: #e57373;
-  border-width: 1px 1px 1px 1px;
+  border-width: 1px;
 }
 
 .p-button {
@@ -1065,6 +1069,12 @@
 .p-button .p-badge {
   margin-left: 0.5rem;
 }
+.p-button.p-button-raised {
+  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
+}
+.p-button.p-button-rounded {
+  border-radius: 1rem;
+}
 .p-button.p-button-icon-only {
   width: 2.357rem;
 }
@@ -1072,11 +1082,8 @@
 .p-button.p-button-icon-only .p-button-icon-right {
   margin: 0;
 }
-.p-button.p-button-raised {
-  box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.15);
-}
-.p-button.p-button-rounded {
-  border-radius: 15px;
+.p-button.p-button-icon-only.p-button-rounded {
+  border-radius: 50%;
 }
 
 .p-fluid .p-button {
@@ -1299,9 +1306,9 @@
 }
 .p-datatable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #4DB6AC;
   background: #212529;
   margin-left: 0.5rem;
@@ -1634,7 +1641,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1661,7 +1668,7 @@
   min-width: 2.357rem;
   height: 2.357rem;
   border: 0 none;
-  margin: 2px;
+  margin: 0.143rem;
   transition: background-color 0.2s, box-shadow 0.2s;
   border-radius: 3px;
 }
@@ -1866,9 +1873,9 @@
 }
 .p-treetable .p-sortable-column .p-sortable-column-badge {
   border-radius: 50%;
-  height: 18px;
-  min-width: 18px;
-  line-height: 18px;
+  height: 1.143rem;
+  min-width: 1.143rem;
+  line-height: 1.143rem;
   color: #4DB6AC;
   background: #212529;
   margin-left: 0.5rem;
@@ -2337,7 +2344,7 @@
   border-bottom-left-radius: 3px;
 }
 .p-fileupload .p-progressbar {
-  height: 4px;
+  height: 0.25rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
@@ -2378,7 +2385,7 @@
 }
 
 .p-contextmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   color: #ebedef;
   border: 0 none;
@@ -2420,7 +2427,7 @@
   box-shadow: inset 0 0 0 0.15rem #B2DFDB;
 }
 .p-contextmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2436,7 +2443,7 @@
 }
 .p-contextmenu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-contextmenu .p-submenu-icon {
   font-size: 0.75rem;
@@ -2450,7 +2457,7 @@
   border-radius: 3px;
 }
 .p-megamenu .p-megamenu-root-list .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-megamenu .p-menuitem-link {
@@ -2503,12 +2510,12 @@
   border-top-left-radius: 3px;
 }
 .p-megamenu .p-megamenu-submenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   width: 12.5rem;
 }
 .p-megamenu .p-megamenu-submenu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-megamenu .p-menuitem.p-menuitem-active > .p-menuitem-link {
   background: #525e6b;
@@ -2521,11 +2528,11 @@
 }
 .p-megamenu.p-megamenu-vertical {
   width: 12.5rem;
-  padding: 4px 0;
+  padding: 0.25rem 0;
 }
 
 .p-menu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   color: #ebedef;
   border: 1px solid #3d4b59;
@@ -2581,7 +2588,7 @@
 }
 .p-menu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 
 .p-menubar {
@@ -2592,7 +2599,7 @@
   border-radius: 3px;
 }
 .p-menubar .p-menubar-root-list > .p-menuitem > .p-menuitem-link .p-submenu-icon {
-  margin: 0 0 0 5px;
+  margin: 0 0 0 0.5rem;
   font-size: 0.75rem;
 }
 .p-menubar .p-menuitem-link {
@@ -2630,7 +2637,7 @@
   box-shadow: inset 0 0 0 0.15rem #B2DFDB;
 }
 .p-menubar .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2638,7 +2645,7 @@
 }
 .p-menubar .p-submenu-list .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-menubar .p-submenu-list .p-submenu-icon {
   font-size: 0.75rem;
@@ -2694,7 +2701,7 @@
   color: #ebedef;
 }
 .p-panelmenu .p-panelmenu-content {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   border: 1px solid #283747;
   background: #283747;
   color: #ebedef;
@@ -2850,7 +2857,7 @@
 }
 
 .p-tieredmenu {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   color: #ebedef;
   border: 1px solid #3d4b59;
@@ -2896,7 +2903,7 @@
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
 }
 .p-tieredmenu .p-submenu-list {
-  padding: 4px 0;
+  padding: 0.25rem 0;
   background: #283747;
   border: 0 none;
   box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.1);
@@ -2912,7 +2919,7 @@
 }
 .p-tieredmenu .p-menu-separator {
   border-top: 1px solid rgba(255, 255, 255, 0.1);
-  margin: 4px 0;
+  margin: 0.25rem 0;
 }
 .p-tieredmenu .p-submenu-icon {
   font-size: 0.75rem;