diff --git a/core/misc/revealpass.js b/core/misc/revealpass.js
index bb42a31..66bd5ba 100644
--- a/core/misc/revealpass.js
+++ b/core/misc/revealpass.js
@@ -20,7 +20,7 @@
   }
 
   function revealLink(index, element) {
-    var $trigger = $('<button type="button" class="link">' + showPass + '</button>');
+    var $trigger = $('<button type="button" class="link toggle-password">' + showPass + '</button>');
 
     $trigger.on('click', {password: element}, revealClickHandle);
     $trigger.insertAfter(element);
diff --git a/core/modules/system/src/Tests/Form/FormTest.php b/core/modules/system/src/Tests/Form/FormTest.php
index 2d41375..5da5b0a 100644
--- a/core/modules/system/src/Tests/Form/FormTest.php
+++ b/core/modules/system/src/Tests/Form/FormTest.php
@@ -74,10 +74,6 @@ function testRequiredFields() {
     $elements['password']['element'] = array('#title' => $this->randomMachineName(), '#type' => 'password');
     $elements['password']['empty_values'] = $empty_strings;
 
-    // @todo remove element?
-    $elements['password_confirm']['element'] = array('#title' => $this->randomMachineName(), '#type' => 'password_confirm');
-    $elements['password_confirm']['empty_values'] = $empty_strings;
-
     $elements['textarea']['element'] = array('#title' => $this->randomMachineName(), '#type' => 'textarea');
     $elements['textarea']['empty_values'] = $empty_strings;
 
diff --git a/core/themes/classy/css/components/user.css b/core/themes/classy/css/components/user.css
index 03ef7f0..2d1b2fe 100644
--- a/core/themes/classy/css/components/user.css
+++ b/core/themes/classy/css/components/user.css
@@ -52,8 +52,10 @@
 [dir="rtl"] .password-parent {
   clear: right;
 }
-.password-parent button.link {
-  margin: 0 0.75em;
+@media all and (min-width: 600px) {
+  .password-parent .toggle-password {
+    margin: 0 0.75em;
+  }
 }
 
 /* Styling for the status indicator of the passwords match test.  */
diff --git a/core/themes/stable/css/user/user.module.css b/core/themes/stable/css/user/user.module.css
index 0b6afcf..6fbec09 100644
--- a/core/themes/stable/css/user/user.module.css
+++ b/core/themes/stable/css/user/user.module.css
@@ -16,6 +16,3 @@
   width: 0;
   background-color: gray;
 }
-.password-confirm-match {
-  visibility: hidden;
-}