diff --git a/core/themes/bartik/css/components/form.css b/core/themes/bartik/css/components/form.css
index 2ba0ea70bc..b3e44bbd02 100644
--- a/core/themes/bartik/css/components/form.css
+++ b/core/themes/bartik/css/components/form.css
@@ -13,6 +13,19 @@ form {
   margin: 0;
   padding: 0;
 }
+/**
+ * Prevent regression due to explicit line-height applied to these elements in
+ * normalize.css 7.0.0.
+ */
+button {
+  line-height: 1.21875rem;
+}
+input:not([type="file"]) {
+  line-height: normal;
+}
+select {
+  line-height: 1.5;
+}
 /**
  * 1. Prevent regression due to fieldset styling that was removed in
  *    normalize.css 6.0.0.
@@ -92,14 +105,6 @@ input,
 textarea {
   font-size: 0.929em;
 }
-/**
- * Prevent regression due to explicit line-height applied to these elements in
- * normalize.css 7.0.0.
- */
-input:not([type="file"]),
-button {
-  line-height: 1.21875rem;
-}
 
 /**
  * Prevent regression due to -webkit-appearance being set to button in
diff --git a/core/themes/seven/css/components/form.css b/core/themes/seven/css/components/form.css
index d5b0940878..8d09c670aa 100644
--- a/core/themes/seven/css/components/form.css
+++ b/core/themes/seven/css/components/form.css
@@ -5,6 +5,30 @@ form {
   margin: 0;
   padding: 0;
 }
+
+/**
+ * Prevent regression due to explicit line-height and font-size applied to these
+ * elements in normalize.css 7.0.0.
+ */
+button:not(.button),
+input:not([type="file"],.form-text, .form-textarea) {
+  line-height: 1.25em;
+}
+textarea,
+input[type="search"],
+input[type="number"],
+input[type="email"] {
+  line-height: normal;
+}
+select {
+  line-height: 1.42902em;
+  font-size: 0.8125rem;
+}
+details select {
+  line-height: 1.20324em;
+}
+
+
 /**
  * Prevent regression due to fieldset styling that was removed in normalize.css
  * 6.0.0.
@@ -363,22 +387,6 @@ div.filter-options select {
   padding: 0;
 }
 
-/**
- * Prevent regression due to explicit line-height and font-size applied to these
- * elements in normalize.css 7.0.0.
- */
-button,
-input:not([type="file"]),
-select {
-  line-height: 1.25rem;
-}
-textarea {
-  line-height: normal;
-}
-select {
-  font-size: 0.8125rem;
-}
-
 /**
  * Prevent regression due to -webkit-appearance being set to button in
  * normalize.css 4.1.0.
diff --git a/core/themes/stable/css/core/misc/normalize-fixes.css b/core/themes/stable/css/core/normalize-fixes.css
similarity index 100%
rename from core/themes/stable/css/core/misc/normalize-fixes.css
rename to core/themes/stable/css/core/normalize-fixes.css
diff --git a/core/themes/stable/stable.info.yml b/core/themes/stable/stable.info.yml
index e807bd0519..511d884446 100644
--- a/core/themes/stable/stable.info.yml
+++ b/core/themes/stable/stable.info.yml
@@ -90,7 +90,7 @@ libraries-override:
         misc/vertical-tabs.css: css/core/vertical-tabs.css
 
   # Load version 3.0.3 of normalize.css for backwards compatibility.
-#  core/normalize: stable/normalize
+  core/normalize: stable/normalize
 
   dblog/drupal.dblog:
     css:
diff --git a/core/themes/stable/stable.libraries.yml b/core/themes/stable/stable.libraries.yml
index cdb2114575..8ef4f9928d 100644
--- a/core/themes/stable/stable.libraries.yml
+++ b/core/themes/stable/stable.libraries.yml
@@ -18,4 +18,4 @@ normalize:
   css:
     base:
       css/core/assets/vendor/normalize-css/normalize.css: { weight: -20 }
-      css/core/misc/normalize-fixes.css: { weight: -19 }
+      css/core/normalize-fixes.css: { weight: -19 }