Index: extensions/BMO/template/en/default/hook/bug_modal/edit-top_actions.html.tmpl
===================================================================
--- extensions/BMO/template/en/default/hook/bug_modal/edit-top_actions.html.tmpl
+++ extensions/BMO/template/en/default/hook/bug_modal/edit-top_actions.html.tmpl
@@ -16,7 +16,7 @@
     END;
   END;
 %]
-<button type="button" class="minor button-link"
-  data-href="page.cgi?id=attachment_bounty_form.html&amp;bug_id=[% bug.id FILTER none %]">
-  [% has_bounty_attachment ? "Edit" : "Add" %] Bounty Tracking Attachment
-</button>
+<a class="button minor" role="button"
+   href="page.cgi?id=attachment_bounty_form.html&amp;bug_id=[% bug.id FILTER uri %]">
+   [% has_bounty_attachment ? "Edit" : "Add" %] Bounty Tracking Attachment
+</a>
Index: extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl
===================================================================
--- extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl
+++ extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl
@@ -7,8 +7,8 @@
   #%]
 
 <div id="comment-actions">
-  <button type="button" id="comment-tags-btn" style="display:none" class="minor">Tags &#9662;</button>
-  <button type="button" id="view-menu-btn" class="minor">View &#9662;</button>
+  <a id="comment-tags-btn" role="button" style="display:none" class="button minor">Tags &#9662;</a>
+  <a id="view-menu-btn" role="button" class="button minor">View &#9662;</a>
 </div>
 
 <menu id="view-menu" type="context" style="display:none">
@@ -63,7 +63,7 @@
   <div id="ctag" style="display:none">
     <input id="ctag-add" size="10" placeholder="add tag"
       maxlength="[% constants.MAX_COMMENT_TAG_LENGTH FILTER html %]">
-    <button type="button" id="ctag-close" class="minor">X</button>
+    <a id="ctag-close" role="button" class="button minor">X</a>
     <a href="https://wiki.mozilla.org/BMO/comment_tagging" target="_blank" title="About Comment Tagging">Help</a>
   </div>
   <div id="ctag-error" style="display:none">
@@ -114,17 +114,17 @@
           [% Hook.process('comment_action', 'bug_modal/activity_stream.html.tmpl') %]
           [% IF user.id %]
             [% IF user.can_tag_comments %]
-              <button class="tag-btn minor" type="button"
+              <a class="tag-btn button minor"
                 data-id="[% comment.id FILTER none %]"
                 data-no="[% comment.count FILTER none %]"
-              >Tag</button>
+              >Tag</a>
             [% END %]
-            <button type="button" class="reply-btn minor"
+            <a class="reply-btn button minor"
               data-reply-id="[% comment.count FILTER none %]"
               data-reply-name="[% comment.author.name || comment.author.moz_nick FILTER html %]"
-              >Reply</button>
+              >Reply</a>
           [% END %]
-          <button type="button" class="change-spinner minor" id="cs-[% comment.count FILTER none %]">-</button>
+          <a class="change-spinner button minor" id="cs-[% comment.count FILTER none %]">-</a>
         </td>
       </tr>
 
@@ -166,9 +166,9 @@
             Comment hidden ([% comment.collapsed_reason FILTER html %])
         </td>
         <td class="comment-actions">
-          <button type="button" class="change-spinner minor" id="ccs-[% comment.count FILTER none %]">
+          <a class="change-spinner button minor" id="ccs-[% comment.count FILTER none %]">
             [%~ comment.collapsed ? "+" : "-" ~%]
-          </button>
+          </a>
         </td>
       </tr>
       </table>
@@ -197,7 +197,7 @@
           [% END %]
         </td>
         <td class="comment-actions">
-          <button type="button" class="change-spinner minor" id="as-[% id FILTER none %]">-</button>
+          <a class="change-spinner button minor" id="as-[% id FILTER none %]">-</a>
         </td>
       </tr>
       <tr id="ar-[% id FILTER none %]">
Index: extensions/BugModal/template/en/default/bug_modal/attachments.html.tmpl
===================================================================
--- extensions/BugModal/template/en/default/bug_modal/attachments.html.tmpl
+++ extensions/BugModal/template/en/default/bug_modal/attachments.html.tmpl
@@ -97,7 +97,7 @@
 
 <div id="attachments-actions">
   [% IF obsolete_attachments %]
-    <button type="button" id="attachments-obsolete-btn" class="minor">Show Obsolete Attachments</button>
+    <a id="attachments-obsolete-btn" role="button" class="button minor">Show Obsolete Attachments</a>
   [% END %]
 </div>
 
Index: extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
===================================================================
--- extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
+++ extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
@@ -284,31 +284,31 @@
   [%# buttons %]
 
   <div id="mode-container">
-    <div>
-      [% IF user.id %]
-        <button type="button" id="cancel-btn" class="minor" style="display:none">Cancel</button>
-        <button type="button" id="mode-btn" class="major">
+    [% IF user.id %]
+      <div class="mode-button-row">
+        <a id="cancel-btn" role="button" class="button minor" style="display:none">Cancel</a>
+        <a id="mode-btn" role="button" class="button major">
           <span id="mode-btn-readonly" title="Enable editing fields for [% terms.bug %] metadata">Edit [% terms.Bug %]</span>
           <span id="mode-btn-loading">
             <img id="edit-throbber" src="extensions/BugModal/web/throbber.gif" width="16" height="11">
             Fetching
           </span>
-        </button>
-        <button type="submit" id="commit-btn" class="save-btn major" style="display:none">Save Changes</button>
-      [% END %]
-    </div>
+        </a>
+        <a id="commit-btn" role="button" class="button save-btn major" style="display:none">Save Changes</a>
+      </div>
+    [% END %]
     <div class="button-row">
       [% IF bug.assigned_to.id == user.id || user.in_group("editbugs") %]
-        <button type="button" id="copy-summary" class="minor"
-          title="Copy [% terms.bug %] number and summary to your clipboard">Copy Summary</button>
+        <a id="copy-summary" role="button" class="button minor"
+          title="Copy [% terms.bug %] number and summary to your clipboard">Copy Summary</a>
         <div id="clip-container" style="display:none"><input type="text" id="clip"></div>
       [% END %]
       [% IF user.id %]
-        <button type="button" class="minor" id="cc-btn" data-is-cced="[% is_cced ? 1 : 0 %]">
+        <a class="button minor" role="button" id="cc-btn" data-is-cced="[% is_cced ? 1 : 0 %]">
           [% is_cced ? "Stop Following" : "Follow" %]
-        </button>
+        </a>
       [% END %]
-      <button type="button" id="action-menu-btn" class="minor">&#9662;</button>
+      <a id="action-menu-btn" role="button" class="button minor">&#9662;</a>
       <menu id="action-menu" type="context" style="display:none">
         <menuitem id="action-reset" label="Reset Sections"></menuitem>
         <menuitem id="action-expand-all" label="Expand All Sections"></menuitem>
@@ -375,8 +375,8 @@
             hidden        = 1
             throbber      = "product-throbber"
         %]
-        <button id="product-search" type="button" class="minor">Search</button>
-        <button id="product-search-cancel" type="button" class="minor" style="display:none">X</button>
+        <a id="product-search" role="button" class="button minor">Search</a>
+        <a id="product-search-cancel" role="button" class="button minor" style="display:none">X</a>
         <img id="product-throbber" src="extensions/BugModal/web/throbber.gif"
           width="16" height="11" style="display:none">
         <img id="product-search-error" class="tt" src="extensions/BugModal/web/error.png"
@@ -512,9 +512,9 @@
   %]
   [% UNLESS prefix %]
     <div id="assigned-container" style="display:none">
-      <button type="button" class="minor" id="mark-as-assigned-btn">
+      <a class="button minor" role="button" id="mark-as-assigned-btn">
         Mark as Assigned
-      </button>
+      </a>
     </div>
   [% END %]
   [% IF bug.choices.resolution.only("name", "DUPLICATE").size %]
@@ -524,9 +524,9 @@
         size="6" value="[% bug.dup_id FILTER html %]">
     </div>
     <div id="[% prefix FILTER none %]duplicate-actions">
-      <button type="button" class="minor" id="[% prefix FILTER none %]mark-as-dup-btn">
+      <a class="button minor" role="button" id="[% prefix FILTER none %]mark-as-dup-btn">
         Mark as Duplicate
-      </button>
+      </a>
     </div>
   [% END %]
 [% END %]
@@ -561,7 +561,7 @@
       [% IF unassigned %]
         <i>Unassigned</i>
         [% IF bug.check_can_change_field("assigned_to", 0, 1) %]
-          <button type="button" class="take-btn minor" data-field="assigned_to">Take</button>
+          <a class="take-btn button minor" data-field="assigned_to">Take</a>
         [% END %]
       [% ELSE %]
         [% INCLUDE bug_modal/user.html.tmpl u=bug.assigned_to %]
@@ -672,7 +672,7 @@
           hide_on_view = 1
           help = "https://wiki.mozilla.org/BMO/UserGuide/BugFields#needinfo"
       %]
-        <button type="button" id="needinfo-scroll" class="minor">Update</button>
+        <a id="needinfo-scroll" role="button" class="button minor">Update</a>
       [% END %]
     [% END %]
 
@@ -715,7 +715,7 @@
       [% END %]
 
       [% IF user.id %]
-        <button type="button" id="add-cc-btn" class="minor">Add</button>
+        <a id="add-cc-btn" role="button" class="button minor">Add</a>
       [% END %]
 
       [% IF bug.cc && bug.cc.size %]
@@ -842,7 +842,7 @@
         %]
           <span id="cab-review-gate">
             <a href="https://mozilla.service-now.com/change_request.do?sysparm_stack=change_request_list.do&amp;sys_id=-1&amp;sysparm_query=active=true" target="_blank">ServiceNow Change Request</a>
-            <button id="cab-review-gate-close" type="button" class="minor">Use Flag</button>
+            <a id="cab-review-gate-close" role="button" class="button minor">Use Flag</a>
           </span>
           <span id="cab-review-edit" style="display:none">
             [% INCLUDE bug_modal/field.html.tmpl
@@ -1027,9 +1027,9 @@
         [% bug.votes FILTER html %]
         vote[% "s" IF bug.votes != 1 %]
         [% IF user.id %]
-          <button type="button" class="minor" id="vote-btn">
+          <a class="button minor" role="button" id="vote-btn">
             [% bug.user_votes ? "Remove vote" : "Vote" %]
-          </button>
+          </a>
         [% END %]
       [% END %]
     [% END %]
@@ -1120,10 +1120,10 @@
     [% IF user.id %]
       <div id="user-story-actions">
         [% IF bug.check_can_change_field('cf_user_story', 0, 1) %]
-          <button type="button" class="minor" id="user-story-edit-btn">Edit</button>
+          <a class="button minor" role="button" id="user-story-edit-btn">Edit</a>
         [% END %]
         [% IF bug.cf_user_story != "" && bug.check_can_change_field('longdesc', 0, 1) %]
-          <button type="button" class="minor" id="user-story-reply-btn">Reply</button>
+          <a class="button minor" role="button" id="user-story-reply-btn">Reply</a>
         [% END %]
       </div>
     [% END %]
@@ -1265,14 +1265,15 @@
 
 [% IF user.id %]
   <div id="top-actions">
-    <button type="button" id="attachments-add-btn" class="minor">Attach File</button>
+    <a id="attachments-add-btn" class="button minor" role="button"
+       href="attachment.cgi?bugid=[% bug.bug_id FILTER uri %]&action=enter">Attach File</a>
     [% IF user.settings.comment_box_position.value == 'after_comments' %]
-      <button type="button" id="add-comment-btn" class="minor">Add Comment &darr;</button>
+      <a id="add-comment-btn" role="button" class="button minor">Add Comment &darr;</a>
     [% ELSE %]
-      <button type="button" id="bottom-btn" class="minor">Bottom &darr;</button>
+      <a id="bottom-btn" role="button" class="button minor">Bottom &darr;</a>
     [% END %]
     [%+ Hook.process('top_actions') %]
-    <button type="submit" class="save-btn major" id="top-save-btn" style="display:none">Save Changes</button>
+    <a class="save-btn button major" id="top-save-btn" style="display:none">Save Changes</a>
   </div>
 [% END %]
 
@@ -1294,10 +1295,10 @@
 
 <div id="bottom-actions">
   <div id="bottom-right-actions">
-    <button type="button" id="top-btn" class="minor">Top &uarr;</button>
-    <button type="button" id="format-btn" class="minor">Format &#9662;</button>
+    <a id="top-btn" role="button" class="button minor">Top &uarr;</a>
+    <a id="format-btn" role="button" class="button minor">Format &#9662;</a>
     [% IF user.id %]
-      <button type="button" id="new-bug-btn" class="minor">New/Clone [% terms.Bug %] &#9662;</button>
+      <a id="new-bug-btn" role="button" class="button minor">New/Clone [% terms.Bug %] &#9662;</a>
     [% END %]
   </div>
 </div>
@@ -1325,7 +1326,7 @@
   [%# === comment actions === %]
   [% IF user.id %]
     <div id="new-comment-actions">
-      <button type="submit" class="save-btn major" id="bottom-save-btn">Save Changes</button>
+      <a class="save-btn button major" id="bottom-save-btn">Save Changes</a>
       <div id="resolve-as">
         [%
           IF bug.resolution == "";
@@ -1336,14 +1337,14 @@
                 seen_header = 1;
                 " Resolve as ";
               END;
-              %] <button type="button" class="minor resolution-btn">[% resolution FILTER html %]</button> [%
+              %] <a role="button" class="button minor resolution-btn">[% resolution FILTER html %]</a> [%
             END;
           ELSE;
             IF bug.choices.bug_status.only("name", "VERIFIED").size && bug.bug_status != "VERIFIED";
-              %] <button type="button" class="minor status-btn" data-status="VERIFIED">VERIFY</button> [%
+              %] <a role="button" class="button minor status-btn" data-status="VERIFIED">VERIFY</a> [%
             END;
             IF bug.choices.bug_status.only("name", "REOPENED").size;
-              %] <button type="button" class="minor status-btn" data-status="REOPENED">REOPEN</button> [%
+              %] <a role="button" class="button minor status-btn" data-status="REOPENED">REOPEN</a> [%
             END;
           END;
         %]
Index: extensions/BugModal/template/en/default/bug_modal/field.html.tmpl
===================================================================
--- extensions/BugModal/template/en/default/bug_modal/field.html.tmpl
+++ extensions/BugModal/template/en/default/bug_modal/field.html.tmpl
@@ -223,11 +223,11 @@
           <input name="[% name FILTER html %]" id="[% name FILTER html %]" value="[% value FILTER html %]" [% aria_labelledby_html FILTER none %]>
         [% CASE constants.FIELD_TYPE_USER %]
           [% IF action && !action.hidden %]
-            <button class="field-button minor [%= action.class FILTER html IF action.class %]"
-              data-field="[% name FILTER html %]"
+          <a class="field-button button minor [%= action.class FILTER html IF action.class %]"
+             role="button" data-field="[% name FILTER html %]"
               [% IF action.id %]id="[% action.id FILTER html %]"[% END %]>
               [% action.caption FILTER html %]
-            </button>
+            </a>
             <div class="field-edit-container">
           [% END %]
           [%# single user %]
@@ -271,8 +271,8 @@
 
         [% CASE constants.FIELD_TYPE_TEXTAREA %]
           [%# text area %]
-            <button type="button" class="minor edit-textarea-btn [%= "edit-textarea-set-btn" IF value != "" %]"
-              id="[% name FILTER html %]-edit">Edit</button>
+          <a class="button minor edit-textarea-btn [%= "edit-textarea-set-btn" IF value != "" %]"
+             role="button" id="[% name FILTER html %]-edit">Edit</a>
             [% IF content.defined && !append_content %]
               <span id="[% name FILTER html %]-view">[% content FILTER none %]</span>
             [% ELSE %]
@@ -339,7 +339,7 @@
   [% END %]
 
   [% IF edit %]
-    <button type="button" id="[% name FILTER html %]-btn" class="bug-urls-btn minor">Add</button>
+    <a id="[% name FILTER html %]-btn" role="button" class="bug-urls-btn button minor">Add</a>
     <input id="[% name FILTER html %]" name="[% name FILTER html %]" style="display:none">
   [% END %]
 [% END %]
Index: extensions/BugModal/web/bug_modal.css
===================================================================
--- extensions/BugModal/web/bug_modal.css
+++ extensions/BugModal/web/bug_modal.css
@@ -39,29 +39,57 @@
     margin-right: 5px;
 }
 
-button.major {
-    font-size: 11px;
-    padding: 4px 8px;
-}
-
-button.minor {
+.button {
+    -moz-box-shadow: 0 1px 0 0 rgba(0,0,0,0.1), inset 0 -1px 0 0 rgba(0,0,0,0.1);
+    -moz-user-select: none;
+    -ms-touch-action: manipulation;
+    -ms-user-select: none;
+    -web-kit-box-shadow: 0 1px 0 0 rgba(0,0,0,0.1), inset 0 -1px 0 0 rgba(0,0,0,0.1);
+    -webkit-user-select: none;
     background-color: #eee;
     background-image: linear-gradient(#fcfcfc, #eee);
+    border-radius: .25em;
+    border: 0px none;
+    box-shadow: 0 1px 0 0 rgba(0,0,0,0.1), inset 0 -1px 0 0 rgba(0,0,0,0.1), inset 0 0 1px 0 rgba(0,0,0,0.1);
     color: #000;
+    cursor: pointer;
+    display: inline-block;
     font-size: 11px;
     font-weight: 500;
-    padding: 4px 8px;
-    margin-bottom: 1px;
+    margin-bottom: 0;
+    padding: 5px 9px;
+    text-align: center;
     text-shadow: none;
-    -web-kit-box-shadow: 0 1px 0 0 rgba(0,0,0,0.1), inset 0 -1px 0 0 rgba(0,0,0,0.1);
-    -moz-box-shadow: 0 1px 0 0 rgba(0,0,0,0.1), inset 0 -1px 0 0 rgba(0,0,0,0.1);
-    box-shadow: 0 1px 0 0 rgba(0,0,0,0.1), inset 0 -1px 0 0 rgba(0,0,0,0.1), inset 0 0 1px 0 rgba(0,0,0,0.1);
+    touch-action: manipulation;
+    user-select: none;
+    white-space: nowrap;
+}
+
+.button.major {
+    color: #fff;
+    background-color: #43a6e2;
+    background-image: linear-gradient(#43a6e2, #277ac1);
+}
+
+.button:hover {
+    text-decoration: none;
+    -moz-transition: all linear 100ms;
+    -webkit-transition: all linear 100ms;
+    transition: all linear 100ms;
 }
 
-button.minor:hover {
+.button.minor:hover {
     -webkit-box-shadow: 0 1px 0 0 rgba(0,0,0,0.2), inset 0 -1px 0 0 rgba(0,0,0,0.3), inset 0 12px 24px 2px #ddd;
     -moz-box-shadow: 0 1px 0 0 rgba(0,0,0,0.2), inset 0 -1px 0 0 rgba(0,0,0,0.3), inset 0 12px 24px 2px #ddd;
     box-shadow: 0 1px 0 0 rgba(0,0,0,0.1), inset 0 -1px 0 0 rgba(0,0,0,0.1), inset 0 12px 24px 2px #ddd;
+    color: #000;
+}
+
+.button.major:hover {
+    -webkit-box-shadow: 0 1px 0 0 rgba(0,0,0,0.2),inset 0 -1px 0 0 rgba(0,0,0,0.3),inset 0 12px 24px 2px #38a9ed;
+    -moz-box-shadow: 0 1px 0 0 rgba(0,0,0,0.2),inset 0 -1px 0 0 rgba(0,0,0,0.3),inset 0 12px 24px 2px #38a9ed;
+    box-shadow: 0 1px 0 0 rgba(0,0,0,0.2),inset 0 -1px 0 0 rgba(0,0,0,0.3),inset 0 12px 24px 2px #38a9ed;
+    color: #fff;
 }
 
 select[multiple], .text_input, .yui-ac-input, input {
@@ -159,7 +187,7 @@
 }
 
 .module-content {
-    padding: 2px 5px;
+    padding: 5px 5px 8px 5px;
     background: #fff;
     -webkit-box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.1);
     -moz-box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.1);
@@ -167,7 +195,7 @@
 }
 
 .module .field {
-    margin-top: 4px;
+    margin-top: 5px;
     vertical-align: top;
     display: table;
     width: 100%;
@@ -305,6 +333,7 @@
 }
 
 #user-story-actions {
+    padding-top: 3px;
     float: right;
 }
 
@@ -342,7 +371,7 @@
     display: inline-block;
 }
 
-#cc-list button {
+#cc-list .button {
     padding: 2px 4px;
 }
 
@@ -373,7 +402,7 @@
 /* actions */
 
 #top-actions {
-    margin: 4px 0;
+    margin: 5px 0;
 }
 
 #top-actions .save-btn {
@@ -460,7 +489,7 @@
     display: inline;
 }
 
-#attachments-actions button {
+#attachments-actions .button {
     margin: 2px;
 }
 
@@ -570,7 +599,6 @@
     color: #448844;
 }
 
-
 .change-name, .change-time, .comment-private {
     display: inline;
 }
@@ -582,14 +610,9 @@
 
 .comment-actions {
     white-space: nowrap;
-    vertical-align: top;
     padding: 2px 2px 0 0 !important;
 }
 
-.change-spinner {
-    width: 29px;
-}
-
 .comment-text {
     white-space: pre-wrap;
     font: 13px/1.2 "Droid Sans Mono",Menlo,Monaco,"Courier New",Courier,monospace;
@@ -631,7 +654,7 @@
     margin-bottom: 4px;
 }
 
-#ctag button {
+#ctag .button {
     margin-top: 2px;
 }
 
@@ -798,10 +821,16 @@
     margin: 5px;
 }
 
-#mode-container .button-row {
-    margin-top: 1px;
-    border-left: 5px solid white;
-}
+/*--------------------------------------------------
+* #mode-container .mode-button-row {
+*     padding: 5px 0 8px 0;
+* }
+*
+* #mode-container .button-row {
+*     margin-top: 1px;
+*     border-left: 5px solid white;
+* }
+*--------------------------------------------------*/
 
 /* theme */
 
Index: extensions/BugModal/web/bug_modal.js
===================================================================
--- extensions/BugModal/web/bug_modal.js
+++ extensions/BugModal/web/bug_modal.js
@@ -565,7 +565,7 @@
             if (document.changeform.checkValidity && !document.changeform.checkValidity())
                 return;
             $('.save-btn').attr('disabled', true);
-            this.form.submit();
+            document.changeform.submit();
 
             // remember expanded modules
             $('#editing').val(
@@ -773,13 +773,6 @@
             tracking_flag_change(event.target);
         });
 
-    // add attachments
-    $('#attachments-add-btn')
-        .click(function(event) {
-            event.preventDefault();
-            window.location.href = 'attachment.cgi?bugid=' + BUGZILLA.bug_id + '&action=enter';
-        });
-
     // take button
     $('.take-btn')
         .click(function(event) {
Index: extensions/EditComments/template/en/default/hook/bug_modal/activity_stream-comment_action.html.tmpl
===================================================================
--- extensions/EditComments/template/en/default/hook/bug_modal/activity_stream-comment_action.html.tmpl
+++ extensions/EditComments/template/en/default/hook/bug_modal/activity_stream-comment_action.html.tmpl
@@ -21,6 +21,6 @@
      title="[% comment.edit_count FILTER none %] edit[% "s" UNLESS comment.edit_count == 1 %]">(Edited)</a>
 [% END %]
 
-<button class="edit-comment-btn minor edit-show" type="button" style="display:none"
+<a class="edit-comment-btn button minor edit-show" role="button" type="button" style="display:none"
   data-id="[% comment.id FILTER none %]"
-  data-no="[% comment.count FILTER none %]">Edit</button>
+  data-no="[% comment.count FILTER none %]">Edit</a>