diff --git a/app/scripts/templates/settings/account_recovery/recovery_key.mustache b/app/scripts/templates/settings/account_recovery/recovery_key.mustache
index 681e128a12..4442cbd6ca 100644
--- a/app/scripts/templates/settings/account_recovery/recovery_key.mustache
+++ b/app/scripts/templates/settings/account_recovery/recovery_key.mustache
@@ -13,27 +13,27 @@
 
         {{^isIos}}
             <div class="button-row save-options">
-                <a href="#" class="save-option download-option">
+                <button class="save-option save-option-button download-option">
                     <div class="graphic graphic-download-option"></div>
                     <p class="name">{{#t}}Download{{/t}}</p>
-                </a>
-                <a href="#" class="save-option copy-option">
+                </button>
+                <button class="save-option save-option-button copy-option">
                     <div class="graphic graphic-copy-option"></div>
                     <p class="name">{{#t}}Copy{{/t}}</p>
-                </a>
-                <a href="#" class="save-option print-option">
+                </button>
+                <button class="save-option save-option-button print-option">
                     <div class="graphic graphic-print-option"></div>
                     <p class="name">{{#t}}Print{{/t}}</p>
-                </a>
+                </button>
             </div>
         {{/isIos}}
 
         {{#isIos}}
             <div class="button-row">
-                <a href="#" class="save-option copy-option">
+                <button class="save-option save-option-button copy-option">
                     <div class="graphic graphic-copy-option"></div>
                     <p class="name">{{#t}}Copy{{/t}}</p>
-                </a>
+                </button>
             </div>
         {{/isIos}}
 
diff --git a/app/scripts/templates/settings/avatar_change.mustache b/app/scripts/templates/settings/avatar_change.mustache
index 238c290185..4b8cf30d0a 100644
--- a/app/scripts/templates/settings/avatar_change.mustache
+++ b/app/scripts/templates/settings/avatar_change.mustache
@@ -12,10 +12,10 @@
 
     <nav id="avatar-options">
       <input type="file" id="imageLoader" name="imageLoader" accept="image/png, image/jpeg"/>
-      <a href="#" id="file">{{#t}}Upload{{/t}}</a>
+      <button class="save-option-button" id="file">{{#t}}Upload{{/t}}</button>
       <a href="/settings/avatar/camera" id="camera">{{#t}}Camera{{/t}}</a>
       {{^avatarDefault}}
-      <a href="#" class="remove">{{#t}}Clear{{/t}}</a>
+      <button class="remove save-option-button">{{#t}}Clear{{/t}}</a>
       {{/avatarDefault}}
     </nav>
 
diff --git a/app/scripts/templates/settings/recovery_codes.mustache b/app/scripts/templates/settings/recovery_codes.mustache
index 610946966e..a92414538f 100644
--- a/app/scripts/templates/settings/recovery_codes.mustache
+++ b/app/scripts/templates/settings/recovery_codes.mustache
@@ -36,27 +36,27 @@
 
             {{^isIos}}
                 <div class="button-row save-options">
-                    <a href="#" class="save-option download-option">
+                    <button class="save-option save-option-button download-option">
                         <div class="graphic graphic-download-option"></div>
                         <p class="name">{{#t}}Download{{/t}}</p>
-                    </a>
-                    <a href="#" class="save-option copy-option">
+                    </button>
+                    <button class="save-option save-option-button copy-option">
                         <div class="graphic graphic-copy-option"></div>
                         <p class="name">{{#t}}Copy{{/t}}</p>
-                    </a>
-                    <a href="#" class="save-option print-option">
+                    </button>
+                    <button class="save-option save-option-button print-option">
                         <div class="graphic graphic-print-option"></div>
                         <p class="name">{{#t}}Print{{/t}}</p>
-                    </a>
+                    </button>
                 </div>
             {{/isIos}}
 
             {{#isIos}}
                 <div class="button-row">
-                    <a href="#" class="save-option copy-option">
+                    <button class="save-option save-option-button copy-option">
                         <div class="graphic graphic-copy-option"></div>
                         <p class="name">{{#t}}Copy{{/t}}</p>
-                    </a>
+                    </button>
                 </div>
             {{/isIos}}
         {{/showRecoveryCodes}}
diff --git a/app/styles/modules/_avatar.scss b/app/styles/modules/_avatar.scss
index 442c727c4a..4e631b8611 100644
--- a/app/styles/modules/_avatar.scss
+++ b/app/styles/modules/_avatar.scss
@@ -221,7 +221,7 @@
     margin: 0 -40px -20px -40px;
     padding: 25px 20px 20px;
 
-    a {
+    button, a {
       background: {
         repeat: no-repeat;
         size: 48%;
diff --git a/app/styles/modules/_button-row.scss b/app/styles/modules/_button-row.scss
index ae2ac20a2c..2cfcc2d38e 100644
--- a/app/styles/modules/_button-row.scss
+++ b/app/styles/modules/_button-row.scss
@@ -83,6 +83,20 @@ button {
   }
 }
 
+.save-option-button {
+  background: none;
+  background-color: transparent;
+  color: $link-color-default;
+  display: inline-block;
+  height: 80px;
+  padding: 10px;
+  width: 0;
+}
+
+.save-option-button:hover {
+  background-color: transparent;
+}
+
 button::-moz-focus-inner {
   border: 0;
   padding: 0;