diff --git a/src/main/scss/components/_notifications.scss b/src/main/scss/components/_notifications.scss
index b9fee05c423a..e5f8fa752c8f 100644
--- a/src/main/scss/components/_notifications.scss
+++ b/src/main/scss/components/_notifications.scss
@@ -8,7 +8,7 @@
   grid-template-columns: auto 1fr;
   grid-gap: 1.5ch;
   padding: 0.8rem;
-  border-radius: 10px;
+  border-radius: var(--form-input-border-radius);
   font-weight: 500;
   line-height: 1.66;
   color: var(--text-color);
diff --git a/src/main/scss/form/_file-upload.scss b/src/main/scss/form/_file-upload.scss
index 0cd07b400b42..da15ef4a6019 100644
--- a/src/main/scss/form/_file-upload.scss
+++ b/src/main/scss/form/_file-upload.scss
@@ -36,7 +36,7 @@
     font-size: var(--font-size-sm);
     font-weight: normal;
     color: var(--text-color);
-    border-radius: 0.66rem;
+    border-radius: var(--form-input-border-radius);
     cursor: pointer;
     min-height: 36px;
     white-space: nowrap;
diff --git a/src/main/scss/form/_reorderable-list.scss b/src/main/scss/form/_reorderable-list.scss
index 7cd726556df1..0334a721ef79 100644
--- a/src/main/scss/form/_reorderable-list.scss
+++ b/src/main/scss/form/_reorderable-list.scss
@@ -4,7 +4,7 @@
   position: relative;
   border: 2px dashed var(--input-border);
   padding: 1rem;
-  border-radius: 10px;
+  border-radius: var(--form-input-border-radius);
   margin-bottom: 1rem;
   margin-top: 1rem;
   transition:
diff --git a/src/main/scss/form/_toggle-switch.scss b/src/main/scss/form/_toggle-switch.scss
index 451bceb71cfb..613a4b20ccfc 100644
--- a/src/main/scss/form/_toggle-switch.scss
+++ b/src/main/scss/form/_toggle-switch.scss
@@ -113,8 +113,8 @@
     transition: var(--standard-transition);
     margin-right: 1rem;
     box-shadow:
-      inset 0 0 0 1px rgba(0, 0, 0, 0.05),
-      0 0 0 10px transparent;
+      inset 0 0 0 1.5px color-mix(in srgb, var(--text-color-secondary) 9%, transparent),
+      0 0 0 8px transparent;
   }
 
   &::after {
@@ -132,7 +132,7 @@
     mask-position: center;
     border-radius: 100px;
     transition: var(--standard-transition);
-    box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
+    box-shadow: 0 0 0 1.5px color-mix(in srgb, var(--text-color-secondary) 9%, transparent);
   }
 
   &:hover::before {
@@ -144,7 +144,7 @@
     &::before {
       box-shadow:
         inset 0 0 0 1px rgba(0, 0, 0, 0.05),
-        0 0 0 5px var(--focus-input-glow);
+        0 0 0 4px var(--focus-input-glow);
     }
 
     &::after {