diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index f1674d40f71..98a67476411 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-8964
\ No newline at end of file
+8965
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/.gitrev b/mozilla/webtools/bugzilla/.gitrev
index b9dc7bcb42e..6e1bc54c75a 100644
--- a/mozilla/webtools/bugzilla/.gitrev
+++ b/mozilla/webtools/bugzilla/.gitrev
@@ -1 +1 @@
-d6370f0638bfb1e237334e35e4e23524280cf6d2
\ No newline at end of file
+d9cd47075697a363b94c575526937ad40c617a0b
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/images/csv.png b/mozilla/webtools/bugzilla/images/csv.png
new file mode 100644
index 00000000000..cb29bd7b4e6
Binary files /dev/null and b/mozilla/webtools/bugzilla/images/csv.png differ
diff --git a/mozilla/webtools/bugzilla/images/ical.png b/mozilla/webtools/bugzilla/images/ical.png
new file mode 100644
index 00000000000..aa198578ba2
Binary files /dev/null and b/mozilla/webtools/bugzilla/images/ical.png differ
diff --git a/mozilla/webtools/bugzilla/images/rss.png b/mozilla/webtools/bugzilla/images/rss.png
index 1679ab05b01..79dcc704d0e 100644
Binary files a/mozilla/webtools/bugzilla/images/rss.png and b/mozilla/webtools/bugzilla/images/rss.png differ
diff --git a/mozilla/webtools/bugzilla/images/rss_small.png b/mozilla/webtools/bugzilla/images/rss_small.png
new file mode 100644
index 00000000000..1679ab05b01
Binary files /dev/null and b/mozilla/webtools/bugzilla/images/rss_small.png differ
diff --git a/mozilla/webtools/bugzilla/images/xml.png b/mozilla/webtools/bugzilla/images/xml.png
new file mode 100644
index 00000000000..685300d25e9
Binary files /dev/null and b/mozilla/webtools/bugzilla/images/xml.png differ
diff --git a/mozilla/webtools/bugzilla/skins/standard/buglist.css b/mozilla/webtools/bugzilla/skins/standard/buglist.css
index 318aa43fb22..d614da9ea83 100644
--- a/mozilla/webtools/bugzilla/skins/standard/buglist.css
+++ b/mozilla/webtools/bugzilla/skins/standard/buglist.css
@@ -42,6 +42,31 @@
 .bz_sort_order_primary   { color: black; }
 .bz_sort_order_secondary { color: #777;  }
 
+.bz_query_buttons #xml {
+    vertical-align: middle;
+    padding: 0;
+}
+
+.bz_query_buttons button {
+    border: 0px;
+    background: transparent;
+}
+
+.bz_query_buttons form {
+    display: inline;
+}
+
+.bz_query_links a img {
+    vertical-align: bottom;
+}
+
+.bz_query_links a {
+    text-decoration: none;
+}
+
+.bz_query_links button, .bz_query_edit button {
+    font-size: small;
+}
 
 .bz_id_column {
 }
@@ -131,6 +156,10 @@ td.bz_total {
     vertical-align: middle;
 }
 
+.buglist_menu .bz_query_buttons {
+    display: inline;
+}
+
 div.bz_query_buttons {
     max-width: 15em;
 }
diff --git a/mozilla/webtools/bugzilla/skins/standard/global.css b/mozilla/webtools/bugzilla/skins/standard/global.css
index 13949edc4d5..96d6834fc67 100644
--- a/mozilla/webtools/bugzilla/skins/standard/global.css
+++ b/mozilla/webtools/bugzilla/skins/standard/global.css
@@ -262,7 +262,7 @@ div#docslinks {
 }
 
 .rss {
-    background: transparent url(../../images/rss.png) no-repeat;
+    background: transparent url(../../images/rss_small.png) no-repeat;
     padding-left: 16px;
     line-height: 1.5em;
 }
diff --git a/mozilla/webtools/bugzilla/template/en/default/list/list.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/list/list.html.tmpl
index 248fc2638e0..de289e3dd0e 100644
--- a/mozilla/webtools/bugzilla/template/en/default/list/list.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/list/list.html.tmpl
@@ -195,14 +195,6 @@
           <input type="hidden" name="format" value="multiple">
           <input type="submit" id="long_format" value="Long Format">
         </form>
-        <form method="post" action="show_bug.cgi">
-            <input type="hidden" name="ctype" value="xml">
-          [% FOREACH id = buglist %]
-            <input type="hidden" name="id" value="[% id FILTER html %]">
-          [% END %]
-            <input type="hidden" name="excludefield" value="attachmentdata">
-            <input type="submit" value="XML" id="xml">
-        </form>
 
         [% IF user.is_timetracker %]
           <form method="post" action="summarize_time.cgi">
@@ -220,46 +212,55 @@
             </span>
           [% END %]
         [% END %]
-      </div>
 
+        <form method="post" action="show_bug.cgi">
+          <input type="hidden" name="ctype" value="xml">
+          [% FOREACH id = buglist %]
+            <input type="hidden" name="id" value="[% id FILTER html %]">
+          [% END %]
+          <input type="hidden" name="excludefield" value="attachmentdata">
+          <button type="submit" id="xml">
+            <img src="images/xml.png" width="24" height="24" alt="XML" title="XML Format">
+          </button>
+        </form>
+      </div>
       <div class="bz_query_links">
-        <a href="buglist.cgi?
-        [% urlquerypart FILTER html %]&amp;ctype=csv&amp;human=1">CSV</a> |
-        <a href="buglist.cgi?
-        [% urlquerypart FILTER html %]&amp;title=
-        [%- title FILTER html %]&amp;ctype=atom">Feed</a> |
-        <a href="buglist.cgi?
-        [% urlquerypart FILTER html %]&amp;ctype=ics">iCalendar</a> |
-        <a href="colchange.cgi?
-        [% urlquerypart FILTER html %]&amp;query_based_on=
-          [% defaultsavename OR searchname FILTER uri %]">Change&nbsp;Columns</a> |
+        <a href="buglist.cgi?[% urlquerypart FILTER html %]&amp;ctype=csv&amp;human=1"
+        ><img title="CSV Format" alt="CSV" src="images/csv.png" height="24" width="24"></a>
+        <a href="buglist.cgi?[% urlquerypart FILTER html %]&amp;title=
+           [%- title FILTER uri %]&amp;ctype=atom"
+        ><img title="Feed Format" alt="Feed" src="images/rss.png" height="24" width="24"></a>
+        <a href="buglist.cgi?[% urlquerypart FILTER html %]&amp;ctype=ics"
+        ><img title="iCal Format" alt="iCal" src="images/ical.png" height="24" width="24"></a>
+        <a href="colchange.cgi?[% urlquerypart FILTER html %]&amp;query_based_on=
+           [% defaultsavename OR searchname FILTER uri %]"
+        ><button>Change Columns</button></a>
 
         [% IF bugs.size > 1 && caneditbugs && !dotweak %]
           <a href="buglist.cgi?[% urlquerypart FILTER html %]
             [%- "&order=$qorder" FILTER html IF order %]&amp;tweak=1"
-            >Change&nbsp;Several&nbsp;[% terms.Bugs %]&nbsp;at&nbsp;Once</a>
-          |
+          ><button>Change Several [% terms.Bugs %] at Once</button></a>
         [% END %]
 
         [% IF bugowners && user.id %]
-          <a href="mailto:
-            [% bugowners FILTER html %]">Send&nbsp;Mail&nbsp;to&nbsp;[% terms.Bug %]&nbsp;Assignees</a> |
+          <a href="mailto:[% bugowners FILTER html %]"
+          ><button>Send Mail to [% terms.Bug %] Assignees</button></a>
         [% END %]
 
         [%# Links to more things users can do with this bug list. %]
         [% Hook.process("links") %]
       </div>
-
+      <br>
       <div class="bz_query_edit">
-        <a href="[% PROCESS edit_search_url %]">Edit&nbsp;Search</a>
+        <a href="[% PROCESS edit_search_url %]"><button>Edit Search</button></a>
       </div>
 
       [% IF searchtype == "saved" %]
         <div class="bz_query_forget">
-          | <a href="buglist.cgi?cmdtype=dorem&amp;remaction=forget&amp;namedcmd=
+           <a href="buglist.cgi?cmdtype=dorem&amp;remaction=forget&amp;namedcmd=
                 [% searchname FILTER uri %]&amp;token=
-                [% issue_hash_token([search_id, searchname]) FILTER uri %]">
-              Forget&nbsp;Search&nbsp;'[% searchname FILTER html %]'</a>
+                [% issue_hash_token([search_id, searchname]) FILTER uri %]"
+           ><button>Forget Search '[% searchname FILTER html %]'</button></a>
         </div>
       [% ELSE %]
         <div class="bz_query_remember">