diff --git a/src/wp-admin/css/forms.css b/src/wp-admin/css/forms.css
index 7274b0bcd7..bdceac04c4 100644
--- a/src/wp-admin/css/forms.css
+++ b/src/wp-admin/css/forms.css
@@ -22,10 +22,6 @@ textarea {
 	resize: vertical;
 }
 
-label {
-	cursor: pointer;
-}
-
 input,
 select {
 	margin: 0 1px;
@@ -287,8 +283,10 @@ textarea.disabled {
 
 input[type="file"]:disabled,
 input[type="file"].disabled,
+input[type="file"][aria-disabled="true"],
 input[type="range"]:disabled,
-input[type="range"].disabled {
+input[type="range"].disabled,
+input[type="range"][aria-disabled="true"] {
 	background: none;
 	box-shadow: none;
 	cursor: default;
@@ -296,13 +294,16 @@ input[type="range"].disabled {
 
 input[type="checkbox"]:disabled,
 input[type="checkbox"].disabled,
+input[type="checkbox"][aria-disabled="true"],
 input[type="radio"]:disabled,
 input[type="radio"].disabled,
+input[type="radio"][aria-disabled="true"],
 input[type="checkbox"]:disabled:checked:before,
 input[type="checkbox"].disabled:checked:before,
 input[type="radio"]:disabled:checked:before,
 input[type="radio"].disabled:checked:before {
 	opacity: 0.7;
+	cursor: default;
 }
 
 /*------------------------------------------------------------------------------
@@ -356,6 +357,10 @@ input[type="radio"].disabled:checked:before {
 	transform: none;
 }
 
+.wp-core-ui select[aria-disabled="true"] {
+	cursor: default;
+}
+
 /* Reset Firefox inner outline that appears on :focus. */
 /* This ruleset overrides the color change on :focus thus needs to be after select:focus. */
 .wp-core-ui select:-moz-focusring {
diff --git a/src/wp-admin/css/install.css b/src/wp-admin/css/install.css
index f42791dec8..1170ff7c32 100644
--- a/src/wp-admin/css/install.css
+++ b/src/wp-admin/css/install.css
@@ -72,10 +72,6 @@ fieldset {
 	margin: 0;
 }
 
-label {
-	cursor: pointer;
-}
-
 #logo {
 	margin: -130px auto 25px;
 	padding: 0 0 25px;
diff --git a/src/wp-includes/css/buttons.css b/src/wp-includes/css/buttons.css
index 787efacab6..56f146d3d6 100644
--- a/src/wp-includes/css/buttons.css
+++ b/src/wp-includes/css/buttons.css
@@ -185,6 +185,11 @@ TABLE OF CONTENTS:
 	transform: none !important;
 }
 
+.wp-core-ui .button[aria-disabled="true"],
+.wp-core-ui .button-secondary[aria-disabled="true"] {
+	cursor: default;
+}
+
 /* Buttons that look like links, for a cross of good semantics with the visual */
 .wp-core-ui .button-link {
 	margin: 0;
@@ -283,6 +288,10 @@ TABLE OF CONTENTS:
 	cursor: default;
 }
 
+.wp-core-ui .button-primary[aria-disabled="true"] {
+	cursor: default;
+}
+
 /* ----------------------------------------------------------------------------
   4.0 - Button Groups
 ---------------------------------------------------------------------------- */