diff --git a/core/modules/color/color.js b/core/modules/color/color.js
index f9eebf2..a44f49f 100644
--- a/core/modules/color/color.js
+++ b/core/modules/color/color.js
@@ -210,9 +210,10 @@
           i = inputs.length;
           if (inputs.length) {
             var toggleClick = true;
-            var lock = $('<div class="lock"></div>').on('click', function () {
+            var lock = $('<button class="lock link">' + Drupal.t('Unlock') + '</button>').on('click', function (e) {
+              e.preventDefault();
               if (toggleClick) {
-                $(this).addClass('unlocked');
+                $(this).addClass('unlocked').html(Drupal.t('Lock'));
                 $(hooks[i - 1]).attr('class',
                   locks[i - 2] && $(locks[i - 2]).is(':not(.unlocked)') ? 'hook up' : 'hook'
                 );
@@ -221,7 +222,7 @@
                 );
               }
               else {
-                $(this).removeClass('unlocked');
+                $(this).removeClass('unlocked').html(Drupal.t('Unlock'));
                 $(hooks[i - 1]).attr('class',
                   locks[i - 2] && $(locks[i - 2]).is(':not(.unlocked)') ? 'hook both' : 'hook down'
                 );
diff --git a/core/modules/color/css/color.admin.css b/core/modules/color/css/color.admin.css
index 5da8c35..3f5e282 100644
--- a/core/modules/color/css/color.admin.css
+++ b/core/modules/color/css/color.admin.css
@@ -62,7 +62,7 @@
   width: 20px;
   height: 19px;
   background: url(../images/lock.png) no-repeat 50% 0;
-  cursor: pointer;
+  text-indent: -9999px;
 }
 [dir="rtl"] #palette .lock {
   float: right;
@@ -87,12 +87,10 @@
   }
   .color-form label {
     float: left; /* LTR */
-    clear: left; /* LTR */
     width: 15em;
   }
   [dir="rtl"] .color-form label {
     float: right;
-    clear: right;
   }
   .color-form .form-text,
   .color-form .form-select {
@@ -104,18 +102,8 @@
     float: right;
   }
   #palette .hook {
-    float: left; /* LTR */
     margin-top: 3px;
   }
-  [dir="rtl"] #palette .hook {
-    float: right;
-  }
-  #palette .lock {
-    float: left; /* LTR */
-  }
-  [dir="rtl"] #palette .lock {
-    float: right;
-  }
 }
 .item-selected {
   background: #eee;