diff --git a/files/app/resource/css/admin.css b/files/app/resource/css/admin.css
index 263383b4..aa04e47f 100755
--- a/files/app/resource/css/admin.css
+++ b/files/app/resource/css/admin.css
@@ -1134,18 +1134,21 @@ label.switch
 }
 .tunnel .switch input[type=checkbox]::before
 {
-    height: 1.4em;
-    width: 1.4em;
+    height: 1.6em;
+    width: 1.6em;
     left: calc(1.7em/2 + .3em);
+    border: 1px solid transparent;
 }
 .tunnel .switch input[type=checkbox]:checked::before
 {
     left: calc(100% - (1.7em/2 + .3em));
-    background-color: var(--service-bg-color-status-inactive);
+    background-color: transparent;
+    border-color: var(--ctrl-modal-textbox-border-color);
 }
 .tunnel .switch.up input[type=checkbox]:checked::before
 {
     background-color: var(--service-bg-color-status-active);
+    border-color: transparent;
 }
 .tunnel input[name=name]
 {
diff --git a/files/app/resource/css/themes/high-contrast.css b/files/app/resource/css/themes/high-contrast.css
index 19b536ea..676ca662 100755
--- a/files/app/resource/css/themes/high-contrast.css
+++ b/files/app/resource/css/themes/high-contrast.css
@@ -30,7 +30,7 @@
     --ctrl-modal-bg-secondary-color: #e0e0e0;
     --ctrl-modal-bg-tertiary-color: #d0d0d0;
     --firmware-status-fg-color: #f0f0f0;
-    --firmware-status-bg-color-positive: #005500;
+    --firmware-status-bg-color-positive: #007500;
     --firmware-status-bg-color-negative: #900000;
     --firmware-status-bg-color-other: #494cd6;
     --conn-fg-color-excellent: #005500;
@@ -40,7 +40,7 @@
     --conn-fg-color-bad: #900000;
     --conn-fg-color-idle: #a0a0a0;
     --service-fg-color-status: #f0f0f0;
-    --service-bg-color-status-active: #005500;
+    --service-bg-color-status-active: #007500;
     --service-bg-color-status-inactive: #808080;
     --service-bg-color-status-disabled: #900000;
     --icon-filter: none;
diff --git a/files/app/resource/css/themes/light.css b/files/app/resource/css/themes/light.css
index 4c0db1ef..73bcb3a3 100755
--- a/files/app/resource/css/themes/light.css
+++ b/files/app/resource/css/themes/light.css
@@ -30,7 +30,7 @@
     --ctrl-modal-bg-secondary-color: #e0e0e0;
     --ctrl-modal-bg-tertiary-color: #d0d0d0;
     --firmware-status-fg-color: #f0f0f0;
-    --firmware-status-bg-color-positive: #005500;
+    --firmware-status-bg-color-positive: #007500;
     --firmware-status-bg-color-negative: #900000;
     --firmware-status-bg-color-other: #494cd6;
     --conn-fg-color-excellent: #005500;
@@ -40,7 +40,7 @@
     --conn-fg-color-bad: #900000;
     --conn-fg-color-idle: #a0a0a0;
     --service-fg-color-status: #f0f0f0;
-    --service-bg-color-status-active: #005500;
+    --service-bg-color-status-active: #007500;
     --service-bg-color-status-inactive: #808080;
     --service-bg-color-status-disabled: #900000;
     --icon-filter: none;