diff --git a/webapp/packages/core-theming/src/styles/_checkbox.scss b/webapp/packages/core-theming/src/styles/_checkbox.scss
index 16b4169927..45f2d22161 100644
--- a/webapp/packages/core-theming/src/styles/_checkbox.scss
+++ b/webapp/packages/core-theming/src/styles/_checkbox.scss
@@ -19,7 +19,7 @@ $mdc-checkbox-icon-size: 16px;
     @extend .mdc-checkbox__native-control;
 
     &:disabled {
-      opacity: 0 !important;
+      opacity: 0;
     }
   }
   .theme-checkbox__background {
diff --git a/webapp/packages/core-theming/src/styles/_form-controls.scss b/webapp/packages/core-theming/src/styles/_form-controls.scss
index f188cd8d1f..96994afe84 100644
--- a/webapp/packages/core-theming/src/styles/_form-controls.scss
+++ b/webapp/packages/core-theming/src/styles/_form-controls.scss
@@ -73,13 +73,20 @@
       @include mdc-theme-prop(border-color, primary, false);
     }
 
-    &:not([data-select='true'])[readonly],
-    &:not([data-select='true'])[disabled] {
+    &:not([data-select='true'])[readonly] {
       @include mdc-theme-prop(color, input-color-readonly, false);
       @include mdc-theme-prop(border-color, input-border-readonly, false);
       @include mdc-theme-prop(background-color, input-background-readonly, false);
       opacity: 1;
-      cursor: text;
+      &:-internal-autofill-selected,
+      &:-internal-autofill-previewed {
+        box-shadow: 0 0 0 50px $input-background-readonly inset;
+      }
+    }
+    &:not([data-select='true'])[disabled] {
+      @include mdc-theme-prop(color, input-color-readonly, false);
+      @include mdc-theme-prop(border-color, input-border-readonly, false);
+      @include mdc-theme-prop(background-color, input-background-readonly, false);
       pointer-events: all;
       &:-internal-autofill-selected,
       &:-internal-autofill-previewed {