diff --git a/src/assets/styles/common-checkbox.scss b/src/assets/styles/common-checkbox.scss
index 5c45ae0..cee4a1e 100644
--- a/src/assets/styles/common-checkbox.scss
+++ b/src/assets/styles/common-checkbox.scss
@@ -24,10 +24,6 @@ $ripple-size: 26px;
     --mdc-checkbox-selected-hover-state-layer-color: var(--iqser-primary);
     --mdc-checkbox-selected-pressed-state-layer-color: var(--iqser-primary);
 
-    input[type='checkbox'] {
-        margin-top: calc($checkbox-size * -1.5);
-    }
-
     .mdc-form-field > label {
         padding-left: 8px;
         line-height: 24px;
@@ -54,7 +50,7 @@ $ripple-size: 26px;
     .mat-mdc-checkbox-touch-target {
         height: $ripple-size;
         width: $ripple-size;
-        transform: translate(calc(($checkbox-size - $ripple-size) / 2), calc(($checkbox-size - $ripple-size) / 2));
+        transform: translate(-50%, -50%);
     }
 }
 
diff --git a/src/assets/styles/common-toggle.scss b/src/assets/styles/common-toggle.scss
index f463999..1b48bef 100644
--- a/src/assets/styles/common-toggle.scss
+++ b/src/assets/styles/common-toggle.scss
@@ -1,6 +1,7 @@
 .mat-mdc-slide-toggle {
     .mdc-switch {
         --mdc-switch-handle-elevation: none;
+        --mdc-switch-handle-elevation-shadow: none;
 
         --mdc-switch-selected-track-color: var(--iqser-primary);
         --mdc-switch-selected-hover-track-color: var(--iqser-primary);