diff --git a/program/js/app.js b/program/js/app.js
index 10add2330..6dc4a3844 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3943,11 +3943,10 @@ function rcube_webmail()
       });
 
       li.append(ul_);
-      li.append($('<input>')
-        .attr('type', 'button')
+      li.append($('<button>')
         .attr('rel', keyrec.keyid)
-        .attr('value', ref.get_label('import'))
-        .addClass('button importkey')
+        .text(ref.get_label('import'))
+        .addClass('button import importkey')
         .prop('disabled', keyrec.revoked || keyrec.disabled || keyrec.expired));
 
       ul.append(li);
@@ -3964,7 +3963,7 @@ function rcube_webmail()
     );
 
     // delegate handler for import button clicks
-    ul.on('click', 'input.button.importkey', function() {
+    ul.on('click', 'button.importkey', function() {
       var btn = $(this),
         keyid = btn.attr('rel'),
         pk = new PublicKey(),
diff --git a/skins/classic/common.css b/skins/classic/common.css
index e21c4a95d..53c93f08d 100644
--- a/skins/classic/common.css
+++ b/skins/classic/common.css
@@ -1636,13 +1636,13 @@ table.quota-info td.root {
   padding: 2px;
 }
 
-.pgpkeyimport div.key input.button.importkey {
+.pgpkeyimport div.key button.importkey {
   position: absolute;
   top: 0.8em;
   right: 0.8em;
   padding: 2px 6px;
 }
 
-.pgpkeyimport div.key input.button[disabled] {
+.pgpkeyimport div.key button[disabled] {
   display: none;
 }
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 3c87df948..594697f84 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -3092,13 +3092,13 @@ button.mce-close,
 	padding: 0.3em;
 }
 
-.pgpkeyimport div.key input.button.importkey {
+.pgpkeyimport div.key button.importkey {
 	position: absolute;
 	top: 0.8em;
 	right: 0.8em;
 	padding: 4px 6px;
 }
 
-.pgpkeyimport div.key input.button[disabled] {
+.pgpkeyimport div.key button[disabled] {
 	display: none;
 }