diff --git a/src/common/css/lib/src/base/base-buttons.css b/src/common/css/lib/src/base/base-buttons.css
index 30632015..5ad64674 100644
--- a/src/common/css/lib/src/base/base-buttons.css
+++ b/src/common/css/lib/src/base/base-buttons.css
@@ -217,7 +217,7 @@ button svg {
   padding-block-end: calc(var(--button-padding-y) * var(--y-medium));
   padding-inline-start: calc(var(--button-padding-x) * var(--x-medium));
   padding-inline-end: calc(var(--button-padding-x) * var(--x-medium));
-  margin-block-start: var(--space-2);
+
 
   &:where(:not([class*='-outline'])) {
     color: white;
diff --git a/src/common/css/lib/src/base/base-forms.css b/src/common/css/lib/src/base/base-forms.css
index ab37f129..fd64f3fe 100644
--- a/src/common/css/lib/src/base/base-forms.css
+++ b/src/common/css/lib/src/base/base-forms.css
@@ -85,7 +85,6 @@ input[type='time'],
 input[type='url'],
 input[type='date'],
 input[type='week'],
-input[type]:not([type='submit']):not([type='reset']),
 textarea {
   background-color: var(--form-field-background-color);
   border-color: var(--form-field-border-color);
diff --git a/src/identity-server/styles/css/login-base.css b/src/identity-server/styles/css/login-base.css
index d023ac74..d214401c 100644
--- a/src/identity-server/styles/css/login-base.css
+++ b/src/identity-server/styles/css/login-base.css
@@ -28,6 +28,10 @@
 	}
 }
 
+button[type="submit"] {
+	margin-block-start: var(--space-2);
+}
+
 /* Forgot password links */
 .login-actions {
 	padding-top: var(--space-1);