# HG changeset patch
# Parent 8ef5eb3494700696bf8d8f098cf1b93607e08ad9

diff --git a/mail/themes/gnomestripe/jar.mn b/mail/themes/gnomestripe/jar.mn
--- a/mail/themes/gnomestripe/jar.mn
+++ b/mail/themes/gnomestripe/jar.mn
@@ -98,16 +98,70 @@ classic.jar:
   skin/classic/messenger/addressbook/icons/abcard-large.png   (mail/addrbook/abcard-large.png)
   skin/classic/messenger/addressbook/icons/remote-addrbook.png (mail/addrbook/remote-addrbook.png)
   skin/classic/messenger/addressbook/icons/remote-addrbook-error.png      (mail/addrbook/remote-addrbook-error.png)
   skin/classic/messenger/addressbook/icons/secure-remote-addrbook.png     (mail/addrbook/secure-remote-addrbook.png)
   skin/classic/messenger/messengercompose/messengercompose.css (mail/compose/messengercompose.css)
   skin/classic/messenger/messengercompose/editorOverlay.css    (mail/compose/editorOverlay.css)
   skin/classic/messenger/messengercompose/compose-toolbar.png  (mail/compose/compose-toolbar.png)
   skin/classic/messenger/messengercompose/compose-toolbar-small.png   (mail/compose/compose-toolbar-small.png)
+  skin/classic/messenger/messengercompose/button-attach-disabled.svg        (mail/compose/button-attach-disabled.svg)
+  skin/classic/messenger/messengercompose/button-attach-hover.svg           (mail/compose/button-attach-hover.svg)
+  skin/classic/messenger/messengercompose/button-attach-small-disabled.svg  (mail/compose/button-attach-small-disabled.svg)
+  skin/classic/messenger/messengercompose/button-attach-small-hover.svg     (mail/compose/button-attach-small-hover.svg)
+  skin/classic/messenger/messengercompose/button-attach-small.svg           (mail/compose/button-attach-small.svg)
+  skin/classic/messenger/messengercompose/button-attach.svg                 (mail/compose/button-attach.svg)
+  skin/classic/messenger/messengercompose/button-copy-disabled.svg          (mail/compose/button-copy-disabled.svg)
+  skin/classic/messenger/messengercompose/button-copy-hover.svg             (mail/compose/button-copy-hover.svg)
+  skin/classic/messenger/messengercompose/button-copy-small-disabled.svg    (mail/compose/button-copy-small-disabled.svg)
+  skin/classic/messenger/messengercompose/button-copy-small-hover.svg       (mail/compose/button-copy-small-hover.svg)
+  skin/classic/messenger/messengercompose/button-copy-small.svg             (mail/compose/button-copy-small.svg)
+  skin/classic/messenger/messengercompose/button-copy.svg                   (mail/compose/button-copy.svg)
+  skin/classic/messenger/messengercompose/button-cut-disabled.svg           (mail/compose/button-cut-disabled.svg)
+  skin/classic/messenger/messengercompose/button-cut-hover.svg              (mail/compose/button-cut-hover.svg)
+  skin/classic/messenger/messengercompose/button-cut-small-disabled.svg     (mail/compose/button-cut-small-disabled.svg)
+  skin/classic/messenger/messengercompose/button-cut-small-hover.svg        (mail/compose/button-cut-small-hover.svg)
+  skin/classic/messenger/messengercompose/button-cut-small.svg              (mail/compose/button-cut-small.svg)
+  skin/classic/messenger/messengercompose/button-cut.svg                    (mail/compose/button-cut.svg)
+  skin/classic/messenger/messengercompose/button-paste-disabled.svg         (mail/compose/button-paste-disabled.svg)
+  skin/classic/messenger/messengercompose/button-paste-hover.svg            (mail/compose/button-paste-hover.svg)
+  skin/classic/messenger/messengercompose/button-paste-small-disabled.svg   (mail/compose/button-paste-small-disabled.svg)
+  skin/classic/messenger/messengercompose/button-paste-small-hover.svg      (mail/compose/button-paste-small-hover.svg)
+  skin/classic/messenger/messengercompose/button-paste-small.svg            (mail/compose/button-paste-small.svg)
+  skin/classic/messenger/messengercompose/button-paste.svg                  (mail/compose/button-paste.svg)
+  skin/classic/messenger/messengercompose/button-quote-disabled.svg         (mail/compose/button-quote-disabled.svg)
+  skin/classic/messenger/messengercompose/button-quote-hover.svg            (mail/compose/button-quote-hover.svg)
+  skin/classic/messenger/messengercompose/button-quote-small-disabled.svg   (mail/compose/button-quote-small-disabled.svg)
+  skin/classic/messenger/messengercompose/button-quote-small-hover.svg      (mail/compose/button-quote-small-hover.svg)
+  skin/classic/messenger/messengercompose/button-quote-small.svg            (mail/compose/button-quote-small.svg)
+  skin/classic/messenger/messengercompose/button-quote.svg                  (mail/compose/button-quote.svg)
+  skin/classic/messenger/messengercompose/button-save-disabled.svg          (mail/compose/button-save-disabled.svg)
+  skin/classic/messenger/messengercompose/button-save-hover.svg             (mail/compose/button-save-hover.svg)
+  skin/classic/messenger/messengercompose/button-save-small-disabled.svg    (mail/compose/button-save-small-disabled.svg)
+  skin/classic/messenger/messengercompose/button-save-small-hover.svg       (mail/compose/button-save-small-hover.svg)
+  skin/classic/messenger/messengercompose/button-save-small.svg             (mail/compose/button-save-small.svg)
+  skin/classic/messenger/messengercompose/button-save.svg                   (mail/compose/button-save.svg)
+  skin/classic/messenger/messengercompose/button-security-disabled.svg      (mail/compose/button-security-disabled.svg)
+  skin/classic/messenger/messengercompose/button-security-hover.svg         (mail/compose/button-security-hover.svg)
+  skin/classic/messenger/messengercompose/button-security-small-disabled.svg  (mail/compose/button-security-small-disabled.svg)
+  skin/classic/messenger/messengercompose/button-security-small-hover.svg   (mail/compose/button-security-small-hover.svg)
+  skin/classic/messenger/messengercompose/button-security-small.svg         (mail/compose/button-security-small.svg)
+  skin/classic/messenger/messengercompose/button-security.svg               (mail/compose/button-security.svg)
+  skin/classic/messenger/messengercompose/button-send-disabled.svg          (mail/compose/button-send-disabled.svg)
+  skin/classic/messenger/messengercompose/button-send-hover.svg             (mail/compose/button-send-hover.svg)
+  skin/classic/messenger/messengercompose/button-send-small-disabled.svg    (mail/compose/button-send-small-disabled.svg)
+  skin/classic/messenger/messengercompose/button-send-small-hover.svg       (mail/compose/button-send-small-hover.svg)
+  skin/classic/messenger/messengercompose/button-send-small.svg             (mail/compose/button-send-small.svg)
+  skin/classic/messenger/messengercompose/button-send.svg                   (mail/compose/button-send.svg)
+  skin/classic/messenger/messengercompose/button-spelling-disabled.svg      (mail/compose/button-spelling-disabled.svg)
+  skin/classic/messenger/messengercompose/button-spelling-hover.svg         (mail/compose/button-spelling-hover.svg)
+  skin/classic/messenger/messengercompose/button-spelling-small-disabled.svg  (mail/compose/button-spelling-small-disabled.svg)
+  skin/classic/messenger/messengercompose/button-spelling-small-hover.svg   (mail/compose/button-spelling-small-hover.svg)
+  skin/classic/messenger/messengercompose/button-spelling-small.svg         (mail/compose/button-spelling-small.svg)
+  skin/classic/messenger/messengercompose/button-spelling.svg               (mail/compose/button-spelling.svg)
   skin/classic/messenger/messengercompose/format-buttons.png  (mail/compose/format-buttons.png)
 % skin messenger-newsblog classic/1.0 %skin/classic/messenger-newsblog/
   skin/classic/messenger-newsblog/feed-subscriptions.css      (mail/newsblog/feed-subscriptions.css)
   skin/classic/messenger-newsblog/icons/rss-feed.png          (mail/newsblog/rss-feed.png)
   skin/classic/messenger-newsblog/icons/server-rss.png        (mail/newsblog/server-rss.png)
   skin/classic/messenger/preferences/alwaysAsk.png            (mail/preferences/alwaysAsk.png)
   skin/classic/messenger/preferences/preferences.css          (mail/preferences/preferences.css)
   skin/classic/messenger/preferences/general.png              (mail/preferences/general.png)
diff --git a/mail/themes/gnomestripe/mail/compose/button-attach-disabled.svg b/mail/themes/gnomestripe/mail/compose/button-attach-disabled.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-attach-disabled.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="m 5,1 0,15.375 7.03125,6.03125 5.96875,-6 L 18,4 16,4 16,15.59375 11.9375,19.6875 7,15.4375 7,3 l 6,0 0,9.21875 -1.5625,1.75 L 10,12.46875 10,5 8,5 l 0,8.28125 3.5,3.625 L 15,13 15,1 z"
+  fill="GrayText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-attach-hover.svg b/mail/themes/gnomestripe/mail/compose/button-attach-hover.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-attach-hover.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="m 5,1 0,15.375 7.03125,6.03125 5.96875,-6 L 18,4 16,4 16,15.59375 11.9375,19.6875 7,15.4375 7,3 l 6,0 0,9.21875 -1.5625,1.75 L 10,12.46875 10,5 8,5 l 0,8.28125 3.5,3.625 L 15,13 15,1 z"
+  fill="ButtonText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-attach-small-disabled.svg b/mail/themes/gnomestripe/mail/compose/button-attach-small-disabled.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-attach-small-disabled.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="M 4,1.03125 4,10.9375 7.9375,15.21875 12,11.4375 12,2.75 l -1,0 0,8.25 -3,2.8125 -3,-3.25 0,-8.53125 4.0087252,0 0,6.78125 -1.09375,1.21875 -0.90625,-1.125 0,-5.65625 -1,0 0,6 1.90625,2.34375 2.0937498,-2.40625 0,-8.15625 z"
+  fill="Graytext"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-attach-small-hover.svg b/mail/themes/gnomestripe/mail/compose/button-attach-small-hover.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-attach-small-hover.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="M 4,1.03125 4,10.9375 7.9375,15.21875 12,11.4375 12,2.75 l -1,0 0,8.25 -3,2.8125 -3,-3.25 0,-8.53125 4.0087252,0 0,6.78125 -1.09375,1.21875 -0.90625,-1.125 0,-5.65625 -1,0 0,6 1.90625,2.34375 2.0937498,-2.40625 0,-8.15625 z"
+  fill="ButtonText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-attach-small.svg b/mail/themes/gnomestripe/mail/compose/button-attach-small.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-attach-small.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="M 4,1.03125 4,10.9375 7.9375,15.21875 12,11.4375 12,2.75 l -1,0 0,8.25 -3,2.8125 -3,-3.25 0,-8.53125 4.0087252,0 0,6.78125 -1.09375,1.21875 -0.90625,-1.125 0,-5.65625 -1,0 0,6 1.90625,2.34375 2.0937498,-2.40625 0,-8.15625 z"
+  fill="-moz-menubartext"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-attach.svg b/mail/themes/gnomestripe/mail/compose/button-attach.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-attach.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="m 5,1 0,15.375 7.03125,6.03125 5.96875,-6 L 18,4 16,4 16,15.59375 11.9375,19.6875 7,15.4375 7,3 l 6,0 0,9.21875 -1.5625,1.75 L 10,12.46875 10,5 8,5 l 0,8.28125 3.5,3.625 L 15,13 15,1 z"
+  fill="-moz-menubartext"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-copy-disabled.svg b/mail/themes/gnomestripe/mail/compose/button-copy-disabled.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-copy-disabled.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="M 8,3.0000001 8,6 16.95491,6.045089 17,18 l 4.087694,0 0,-14.9999999 z M 3,7 3,22 16,22 16,7 z m 2,2.983534 9,0 0,1 -9,0 z m 0.00431,4.035941 9.001345,0 0,0.980525 -9.001345,0 z m 0.049052,4.00961 8.967918,0 0,0.955521 -8.967918,0 z"
+  fill="GrayText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-copy-hover.svg b/mail/themes/gnomestripe/mail/compose/button-copy-hover.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-copy-hover.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="M 8,3.0000001 8,6 16.95491,6.045089 17,18 l 4.087694,0 0,-14.9999999 z M 3,7 3,22 16,22 16,7 z m 2,2.983534 9,0 0,1 -9,0 z m 0.00431,4.035941 9.001345,0 0,0.980525 -9.001345,0 z m 0.049052,4.00961 8.967918,0 0,0.955521 -8.967918,0 z"
+  fill="ButtonText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-copy-small-disabled.svg b/mail/themes/gnomestripe/mail/compose/button-copy-small-disabled.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-copy-small-disabled.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="M 5,2 5,3.96875 11,4 11.03125,12.03125 14,12.03125 14,2 5,2 z M 1,4.96875 1,15 l 9,0 0,-10.03125 -9,0 z M 2,6 9,6 9,7 2,7 2,6 z m 0,3 7,0 0,1 -7,0 0,-1 z m 0,3 7,0 0,1 -7,0 0,-1 z"
+  fill="GrayText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-copy-small-hover.svg b/mail/themes/gnomestripe/mail/compose/button-copy-small-hover.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-copy-small-hover.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="M 5,2 5,3.96875 11,4 11.03125,12.03125 14,12.03125 14,2 5,2 z M 1,4.96875 1,15 l 9,0 0,-10.03125 -9,0 z M 2,6 9,6 9,7 2,7 2,6 z m 0,3 7,0 0,1 -7,0 0,-1 z m 0,3 7,0 0,1 -7,0 0,-1 z"
+  fill="ButtonText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-copy-small.svg b/mail/themes/gnomestripe/mail/compose/button-copy-small.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-copy-small.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="M 5,2 5,3.96875 11,4 11.03125,12.03125 14,12.03125 14,2 5,2 z M 1,4.96875 1,15 l 9,0 0,-10.03125 -9,0 z M 2,6 9,6 9,7 2,7 2,6 z m 0,3 7,0 0,1 -7,0 0,-1 z m 0,3 7,0 0,1 -7,0 0,-1 z"
+  fill="-moz-menubartext"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-copy.svg b/mail/themes/gnomestripe/mail/compose/button-copy.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-copy.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="M 8,3.0000001 8,6 16.95491,6.045089 17,18 l 4.087694,0 0,-14.9999999 z M 3,7 3,22 16,22 16,7 z m 2,2.983534 9,0 0,1 -9,0 z m 0.00431,4.035941 9.001345,0 0,0.980525 -9.001345,0 z m 0.049052,4.00961 8.967918,0 0,0.955521 -8.967918,0 z"
+  fill="-moz-menubartext"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-cut-disabled.svg b/mail/themes/gnomestripe/mail/compose/button-cut-disabled.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-cut-disabled.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="M 5,3 5,5.40625 10.0625,10.5 8.46875,12.09375 C 8.1560981,12.023394 7.8332269,12 7.5,12 5.0265633,12 3.03125,14.026563 3.03125,16.5 3.03125,18.973437 5.0265633,21 7.5,21 9.9734368,21 12,18.973437 12,16.5 12,15.128697 11.347343,13.8956 10.375,13.0625 l 1.125,-1.125 1.625,1.625 C 12.442865,14.357588 12,15.378841 12,16.5 12,18.973438 14.026563,21 16.5,21 18.973437,21 21,18.973438 21,16.5 21,14.026563 18.973437,12 16.5,12 c -0.594312,0 -1.168071,0.09858 -1.6875,0.3125 L 12.96875,10.46875 18,5.40625 18,3 17.59375,3 11.53125,9.0625 5.40625,3 5,3 z M 7.5,14 C 8.8925566,14 10,15.107443 10,16.5 10,17.892557 8.8925566,19 7.5,19 6.1074435,19 5,17.892557 5,16.5 5,15.107443 6.1074435,14 7.5,14 z m 9,0 C 17.892556,14 19,15.107444 19,16.5 19,17.892557 17.892556,19 16.5,19 15.107443,19 14,17.892557 14,16.5 14,15.107444 15.107443,14 16.5,14 z"
+  fill="GrayText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-cut-hover.svg b/mail/themes/gnomestripe/mail/compose/button-cut-hover.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-cut-hover.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="M 5,3 5,5.40625 10.0625,10.5 8.46875,12.09375 C 8.1560981,12.023394 7.8332269,12 7.5,12 5.0265633,12 3.03125,14.026563 3.03125,16.5 3.03125,18.973437 5.0265633,21 7.5,21 9.9734368,21 12,18.973437 12,16.5 12,15.128697 11.347343,13.8956 10.375,13.0625 l 1.125,-1.125 1.625,1.625 C 12.442865,14.357588 12,15.378841 12,16.5 12,18.973438 14.026563,21 16.5,21 18.973437,21 21,18.973438 21,16.5 21,14.026563 18.973437,12 16.5,12 c -0.594312,0 -1.168071,0.09858 -1.6875,0.3125 L 12.96875,10.46875 18,5.40625 18,3 17.59375,3 11.53125,9.0625 5.40625,3 5,3 z M 7.5,14 C 8.8925566,14 10,15.107443 10,16.5 10,17.892557 8.8925566,19 7.5,19 6.1074435,19 5,17.892557 5,16.5 5,15.107443 6.1074435,14 7.5,14 z m 9,0 C 17.892556,14 19,15.107444 19,16.5 19,17.892557 17.892556,19 16.5,19 15.107443,19 14,17.892557 14,16.5 14,15.107444 15.107443,14 16.5,14 z"
+  fill="ButtonText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-cut-small-disabled.svg b/mail/themes/gnomestripe/mail/compose/button-cut-small-disabled.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-cut-small-disabled.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="M 3.625,1.28125 2.25,2.6875 6.5625,6.96875 5.40625,8.09375 C 5.1190088,8.0170178 4.8414738,7.96875 4.53125,7.96875 2.6009688,7.96875 1,9.5697189 1,11.5 1,13.430281 2.6009688,15 4.53125,15 6.2637566,15 7.6889134,13.719821 7.96875,12.0625 8.2473589,13.721255 9.7039662,15 11.4375,15 c 1.930281,0 3.5,-1.569719 3.5,-3.5 0,-1.9302811 -1.569719,-3.53125 -3.5,-3.53125 -0.299883,0 -0.596433,0.053138 -0.875,0.125 L 9.40625,6.9375 13.71875,2.6875 12.3125,1.28125 7.96875,5.5625 3.625,1.28125 z M 7.96875,8.34375 8.8125,9.1875 C 8.3830097,9.6754671 8.0759776,10.270394 7.96875,10.9375 7.8605626,10.267517 7.5892213,9.6450535 7.15625,9.15625 l 0.8125,-0.8125 z m -3.4375,1.625 c 0.8494012,0 1.53125,0.681849 1.53125,1.53125 0,0.849401 -0.6818488,1.5 -1.53125,1.5 -0.8494011,0 -1.5,-0.650599 -1.5,-1.5 0,-0.849401 0.6505989,-1.53125 1.5,-1.53125 z m 6.90625,0 c 0.849401,0 1.53125,0.681849 1.53125,1.53125 0,0.849401 -0.681849,1.5 -1.53125,1.5 -0.849401,0 -1.5,-0.650599 -1.5,-1.5 0,-0.849401 0.650599,-1.53125 1.5,-1.53125 z"
+  fill="GrayText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-cut-small-hover.svg b/mail/themes/gnomestripe/mail/compose/button-cut-small-hover.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-cut-small-hover.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="M 3.625,1.28125 2.25,2.6875 6.5625,6.96875 5.40625,8.09375 C 5.1190088,8.0170178 4.8414738,7.96875 4.53125,7.96875 2.6009688,7.96875 1,9.5697189 1,11.5 1,13.430281 2.6009688,15 4.53125,15 6.2637566,15 7.6889134,13.719821 7.96875,12.0625 8.2473589,13.721255 9.7039662,15 11.4375,15 c 1.930281,0 3.5,-1.569719 3.5,-3.5 0,-1.9302811 -1.569719,-3.53125 -3.5,-3.53125 -0.299883,0 -0.596433,0.053138 -0.875,0.125 L 9.40625,6.9375 13.71875,2.6875 12.3125,1.28125 7.96875,5.5625 3.625,1.28125 z M 7.96875,8.34375 8.8125,9.1875 C 8.3830097,9.6754671 8.0759776,10.270394 7.96875,10.9375 7.8605626,10.267517 7.5892213,9.6450535 7.15625,9.15625 l 0.8125,-0.8125 z m -3.4375,1.625 c 0.8494012,0 1.53125,0.681849 1.53125,1.53125 0,0.849401 -0.6818488,1.5 -1.53125,1.5 -0.8494011,0 -1.5,-0.650599 -1.5,-1.5 0,-0.849401 0.6505989,-1.53125 1.5,-1.53125 z m 6.90625,0 c 0.849401,0 1.53125,0.681849 1.53125,1.53125 0,0.849401 -0.681849,1.5 -1.53125,1.5 -0.849401,0 -1.5,-0.650599 -1.5,-1.5 0,-0.849401 0.650599,-1.53125 1.5,-1.53125 z"
+  fill="ButtonText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-cut-small.svg b/mail/themes/gnomestripe/mail/compose/button-cut-small.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-cut-small.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="M 3.625,1.28125 2.25,2.6875 6.5625,6.96875 5.40625,8.09375 C 5.1190088,8.0170178 4.8414738,7.96875 4.53125,7.96875 2.6009688,7.96875 1,9.5697189 1,11.5 1,13.430281 2.6009688,15 4.53125,15 6.2637566,15 7.6889134,13.719821 7.96875,12.0625 8.2473589,13.721255 9.7039662,15 11.4375,15 c 1.930281,0 3.5,-1.569719 3.5,-3.5 0,-1.9302811 -1.569719,-3.53125 -3.5,-3.53125 -0.299883,0 -0.596433,0.053138 -0.875,0.125 L 9.40625,6.9375 13.71875,2.6875 12.3125,1.28125 7.96875,5.5625 3.625,1.28125 z M 7.96875,8.34375 8.8125,9.1875 C 8.3830097,9.6754671 8.0759776,10.270394 7.96875,10.9375 7.8605626,10.267517 7.5892213,9.6450535 7.15625,9.15625 l 0.8125,-0.8125 z m -3.4375,1.625 c 0.8494012,0 1.53125,0.681849 1.53125,1.53125 0,0.849401 -0.6818488,1.5 -1.53125,1.5 -0.8494011,0 -1.5,-0.650599 -1.5,-1.5 0,-0.849401 0.6505989,-1.53125 1.5,-1.53125 z m 6.90625,0 c 0.849401,0 1.53125,0.681849 1.53125,1.53125 0,0.849401 -0.681849,1.5 -1.53125,1.5 -0.849401,0 -1.5,-0.650599 -1.5,-1.5 0,-0.849401 0.650599,-1.53125 1.5,-1.53125 z"
+  fill="-moz-menubartext"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-cut.svg b/mail/themes/gnomestripe/mail/compose/button-cut.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-cut.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="M 5,3 5,5.40625 10.0625,10.5 8.46875,12.09375 C 8.1560981,12.023394 7.8332269,12 7.5,12 5.0265633,12 3.03125,14.026563 3.03125,16.5 3.03125,18.973437 5.0265633,21 7.5,21 9.9734368,21 12,18.973437 12,16.5 12,15.128697 11.347343,13.8956 10.375,13.0625 l 1.125,-1.125 1.625,1.625 C 12.442865,14.357588 12,15.378841 12,16.5 12,18.973438 14.026563,21 16.5,21 18.973437,21 21,18.973438 21,16.5 21,14.026563 18.973437,12 16.5,12 c -0.594312,0 -1.168071,0.09858 -1.6875,0.3125 L 12.96875,10.46875 18,5.40625 18,3 17.59375,3 11.53125,9.0625 5.40625,3 5,3 z M 7.5,14 C 8.8925566,14 10,15.107443 10,16.5 10,17.892557 8.8925566,19 7.5,19 6.1074435,19 5,17.892557 5,16.5 5,15.107443 6.1074435,14 7.5,14 z m 9,0 C 17.892556,14 19,15.107444 19,16.5 19,17.892557 17.892556,19 16.5,19 15.107443,19 14,17.892557 14,16.5 14,15.107444 15.107443,14 16.5,14 z"
+  fill="-moz-menubartext"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-paste-disabled.svg b/mail/themes/gnomestripe/mail/compose/button-paste-disabled.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-paste-disabled.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="M 10,1 10,2 7,2 7,4 3,4 3,22 21,22 21,4 17,4 17,2 14,2 14,1 z M 6.046875,6 18,6 18,19 6.046875,19 z"
+  fill="GrayText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-paste-hover.svg b/mail/themes/gnomestripe/mail/compose/button-paste-hover.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-paste-hover.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="M 10,1 10,2 7,2 7,4 3,4 3,22 21,22 21,4 17,4 17,2 14,2 14,1 z M 6.046875,6 18,6 18,19 6.046875,19 z"
+  fill="ButtonText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-paste-small-disabled.svg b/mail/themes/gnomestripe/mail/compose/button-paste-small-disabled.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-paste-small-disabled.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="M 7,1 7,2 5,2 5,3 2,3 2,15 14,15 14,3 11,3 11,2 9,2 9,1 7,1 z M 4.03125,4 12,4 l 0,9.03125 -7.96875,0 0,-9.03125 z"
+  fill="GrayText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-paste-small-hover.svg b/mail/themes/gnomestripe/mail/compose/button-paste-small-hover.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-paste-small-hover.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="M 7,1 7,2 5,2 5,3 2,3 2,15 14,15 14,3 11,3 11,2 9,2 9,1 7,1 z M 4.03125,4 12,4 l 0,9.03125 -7.96875,0 0,-9.03125 z"
+  fill="ButtonText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-paste-small.svg b/mail/themes/gnomestripe/mail/compose/button-paste-small.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-paste-small.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="M 7,1 7,2 5,2 5,3 2,3 2,15 14,15 14,3 11,3 11,2 9,2 9,1 7,1 z M 4.03125,4 12,4 l 0,9.03125 -7.96875,0 0,-9.03125 z"
+  fill="-moz-menubartext"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-paste.svg b/mail/themes/gnomestripe/mail/compose/button-paste.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-paste.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="M 10,1 10,2 7,2 7,4 3,4 3,22 21,22 21,4 17,4 17,2 14,2 14,1 z M 6.046875,6 18,6 18,19 6.046875,19 z"
+  fill="-moz-menubartext"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-quote-disabled.svg b/mail/themes/gnomestripe/mail/compose/button-quote-disabled.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-quote-disabled.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="m 7.1937145,6.0228584 c -2.2911558,0 -4.1882521,1.8350106 -4.1882521,4.1450746 0,1.852762 1.3115371,3.241764 2.9792721,3.799651 -0.2988518,0.689258 -0.7228575,1.274752 -1.4248691,2.158893 l -1.3816916,1.683936 2.115715,-0.604489 c 1.7367156,-0.508917 3.2254287,-1.329964 4.3177856,-2.504317 1.0923566,-1.174351 1.7271146,-2.717847 1.7271146,-4.533674 0,-2.310064 -1.8539076,-4.1450746 -4.1450745,-4.1450746 z m 9.5854845,0.043178 c -2.291156,0 -4.145075,1.8350105 -4.145075,4.1450746 0,1.838682 1.288045,3.230455 2.936095,3.799652 -0.300517,0.682909 -0.728202,1.28148 -1.424869,2.158892 l -1.338514,1.683936 2.072537,-0.604489 c 1.736715,-0.508915 3.268606,-1.329964 4.360964,-2.504317 1.092357,-1.174352 1.727114,-2.717847 1.727114,-4.533674 0,-2.3100644 -1.897086,-4.1450748 -4.188252,-4.1450748 z"
+  fill="GrayText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-quote-hover.svg b/mail/themes/gnomestripe/mail/compose/button-quote-hover.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-quote-hover.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="m 7.1937145,6.0228584 c -2.2911558,0 -4.1882521,1.8350106 -4.1882521,4.1450746 0,1.852762 1.3115371,3.241764 2.9792721,3.799651 -0.2988518,0.689258 -0.7228575,1.274752 -1.4248691,2.158893 l -1.3816916,1.683936 2.115715,-0.604489 c 1.7367156,-0.508917 3.2254287,-1.329964 4.3177856,-2.504317 1.0923566,-1.174351 1.7271146,-2.717847 1.7271146,-4.533674 0,-2.310064 -1.8539076,-4.1450746 -4.1450745,-4.1450746 z m 9.5854845,0.043178 c -2.291156,0 -4.145075,1.8350105 -4.145075,4.1450746 0,1.838682 1.288045,3.230455 2.936095,3.799652 -0.300517,0.682909 -0.728202,1.28148 -1.424869,2.158892 l -1.338514,1.683936 2.072537,-0.604489 c 1.736715,-0.508915 3.268606,-1.329964 4.360964,-2.504317 1.092357,-1.174352 1.727114,-2.717847 1.727114,-4.533674 0,-2.3100644 -1.897086,-4.1450748 -4.188252,-4.1450748 z"
+  fill="ButtonText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-quote-small-disabled.svg b/mail/themes/gnomestripe/mail/compose/button-quote-small-disabled.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-quote-small-disabled.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="M 5.03125,2 C 3.3730246,2 2,3.3280902 2,5 2,6.3409379 2.9492258,7.3462286 4.15625,7.75 3.9399558,8.248851 3.6330814,8.6726029 3.125,9.3125 l -1,1.21875 1.53125,-0.4375 C 4.913199,9.7254224 5.990656,9.1311882 6.78125,8.28125 7.571844,7.4313118 8.03125,6.3142062 8.03125,5 c 0,-1.6719098 -1.3417665,-3 -3,-3 z m 6.9375,0.03125 c -1.658225,0 -3,1.3280902 -3,3 0,1.3307474 0.9322232,2.3380436 2.125,2.75 -0.217499,0.4942555 -0.527036,0.9274735 -1.03125,1.5625 l -0.96875,1.21875 1.5,-0.4375 C 11.850699,9.7566728 12.959406,9.1624382 13.75,8.3125 14.540594,7.4625618 15,6.3454562 15,5.03125 c 0,-1.6719098 -1.373017,-3 -3.03125,-3 z"
+  fill="GrayText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-quote-small-hover.svg b/mail/themes/gnomestripe/mail/compose/button-quote-small-hover.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-quote-small-hover.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="M 5.03125,2 C 3.3730246,2 2,3.3280902 2,5 2,6.3409379 2.9492258,7.3462286 4.15625,7.75 3.9399558,8.248851 3.6330814,8.6726029 3.125,9.3125 l -1,1.21875 1.53125,-0.4375 C 4.913199,9.7254224 5.990656,9.1311882 6.78125,8.28125 7.571844,7.4313118 8.03125,6.3142062 8.03125,5 c 0,-1.6719098 -1.3417665,-3 -3,-3 z m 6.9375,0.03125 c -1.658225,0 -3,1.3280902 -3,3 0,1.3307474 0.9322232,2.3380436 2.125,2.75 -0.217499,0.4942555 -0.527036,0.9274735 -1.03125,1.5625 l -0.96875,1.21875 1.5,-0.4375 C 11.850699,9.7566728 12.959406,9.1624382 13.75,8.3125 14.540594,7.4625618 15,6.3454562 15,5.03125 c 0,-1.6719098 -1.373017,-3 -3.03125,-3 z"
+  fill="ButtonText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-quote-small.svg b/mail/themes/gnomestripe/mail/compose/button-quote-small.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-quote-small.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="M 5.03125,2 C 3.3730246,2 2,3.3280902 2,5 2,6.3409379 2.9492258,7.3462286 4.15625,7.75 3.9399558,8.248851 3.6330814,8.6726029 3.125,9.3125 l -1,1.21875 1.53125,-0.4375 C 4.913199,9.7254224 5.990656,9.1311882 6.78125,8.28125 7.571844,7.4313118 8.03125,6.3142062 8.03125,5 c 0,-1.6719098 -1.3417665,-3 -3,-3 z m 6.9375,0.03125 c -1.658225,0 -3,1.3280902 -3,3 0,1.3307474 0.9322232,2.3380436 2.125,2.75 -0.217499,0.4942555 -0.527036,0.9274735 -1.03125,1.5625 l -0.96875,1.21875 1.5,-0.4375 C 11.850699,9.7566728 12.959406,9.1624382 13.75,8.3125 14.540594,7.4625618 15,6.3454562 15,5.03125 c 0,-1.6719098 -1.373017,-3 -3.03125,-3 z"
+  fill="-moz-menubartext"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-quote.svg b/mail/themes/gnomestripe/mail/compose/button-quote.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-quote.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="m 7.1937145,6.0228584 c -2.2911558,0 -4.1882521,1.8350106 -4.1882521,4.1450746 0,1.852762 1.3115371,3.241764 2.9792721,3.799651 -0.2988518,0.689258 -0.7228575,1.274752 -1.4248691,2.158893 l -1.3816916,1.683936 2.115715,-0.604489 c 1.7367156,-0.508917 3.2254287,-1.329964 4.3177856,-2.504317 1.0923566,-1.174351 1.7271146,-2.717847 1.7271146,-4.533674 0,-2.310064 -1.8539076,-4.1450746 -4.1450745,-4.1450746 z m 9.5854845,0.043178 c -2.291156,0 -4.145075,1.8350105 -4.145075,4.1450746 0,1.838682 1.288045,3.230455 2.936095,3.799652 -0.300517,0.682909 -0.728202,1.28148 -1.424869,2.158892 l -1.338514,1.683936 2.072537,-0.604489 c 1.736715,-0.508915 3.268606,-1.329964 4.360964,-2.504317 1.092357,-1.174352 1.727114,-2.717847 1.727114,-4.533674 0,-2.3100644 -1.897086,-4.1450748 -4.188252,-4.1450748 z"
+  fill="-moz-menubartext"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-save-disabled.svg b/mail/themes/gnomestripe/mail/compose/button-save-disabled.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-save-disabled.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="m 3.0022321,3 0,18 L 6,21 l 0,-7 10,0 0,7 5,0 0,-18 z M 6,4 18,4 18,12 6,12 z m 0.851083,11 0,5.992411 8.148917,0 L 15,15 z M 8,16 l 1,0 0,2 -1,0 z"
+  fill="GrayText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-save-hover.svg b/mail/themes/gnomestripe/mail/compose/button-save-hover.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-save-hover.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="m 3.0022321,3 0,18 L 6,21 l 0,-7 10,0 0,7 5,0 0,-18 z M 6,4 18,4 18,12 6,12 z m 0.851083,11 0,5.992411 8.148917,0 L 15,15 z M 8,16 l 1,0 0,2 -1,0 z"
+  fill="ButtonText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-save-small-disabled.svg b/mail/themes/gnomestripe/mail/compose/button-save-small-disabled.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-save-small-disabled.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="m 1,1 0,14 2.0078125,0 0,-5.9921875 7.9921875,0 L 11,15 l 4.03125,0 0,-14 z m 2.03125,1 9.9375,0 0,6.03125 -9.9375,0 z m 0.9693548,7.9987904 0,4.9952926 5.9993952,0 0,-4.9952926 z M 5,11 l 1,0 0,2 -1,0 z"
+  fill="GrayText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-save-small-hover.svg b/mail/themes/gnomestripe/mail/compose/button-save-small-hover.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-save-small-hover.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="m 1,1 0,14 2.0078125,0 0,-5.9921875 7.9921875,0 L 11,15 l 4.03125,0 0,-14 z m 2.03125,1 9.9375,0 0,6.03125 -9.9375,0 z m 0.9693548,7.9987904 0,4.9952926 5.9993952,0 0,-4.9952926 z M 5,11 l 1,0 0,2 -1,0 z"
+  fill="ButtonText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-save-small.svg b/mail/themes/gnomestripe/mail/compose/button-save-small.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-save-small.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="m 1,1 0,14 2.0078125,0 0,-5.9921875 7.9921875,0 L 11,15 l 4.03125,0 0,-14 z m 2.03125,1 9.9375,0 0,6.03125 -9.9375,0 z m 0.9693548,7.9987904 0,4.9952926 5.9993952,0 0,-4.9952926 z M 5,11 l 1,0 0,2 -1,0 z"
+  fill="-moz-menubartext"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-save.svg b/mail/themes/gnomestripe/mail/compose/button-save.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-save.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="m 3.0022321,3 0,18 L 6,21 l 0,-7 10,0 0,7 5,0 0,-18 z M 6,4 18,4 18,12 6,12 z m 0.851083,11 0,5.992411 8.148917,0 L 15,15 z M 8,16 l 1,0 0,2 -1,0 z"
+  fill="-moz-menubartext"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-security-disabled.svg b/mail/themes/gnomestripe/mail/compose/button-security-disabled.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-security-disabled.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="m 11.03125,0.96875 c -3.285154,0 -5.96875,2.6835965 -5.96875,5.96875 l 0,3.03125 -0.65625,0 C 3.622776,9.96875 3,10.591526 3,11.375 l 0,9.28125 c 0,0.783474 0.622776,1.40625 1.40625,1.40625 l 15.1875,0 C 20.377224,22.0625 21,21.439724 21,20.65625 L 21,11.375 C 21,10.591526 20.377224,9.96875 19.59375,9.96875 l -0.5625,0 0,-3.03125 c 0,-3.2851535 -2.683596,-5.96875 -5.96875,-5.96875 l -2.03125,0 z m 0,3 2.03125,0 c 1.675045,0 2.96875,1.2937048 2.96875,2.96875 l 0,3.03125 -7.96875,0 0,-3.03125 c 0,-1.6750452 1.293705,-2.96875 2.96875,-2.96875 z"
+  fill="GrayText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-security-hover.svg b/mail/themes/gnomestripe/mail/compose/button-security-hover.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-security-hover.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="m 11.03125,0.96875 c -3.285154,0 -5.96875,2.6835965 -5.96875,5.96875 l 0,3.03125 -0.65625,0 C 3.622776,9.96875 3,10.591526 3,11.375 l 0,9.28125 c 0,0.783474 0.622776,1.40625 1.40625,1.40625 l 15.1875,0 C 20.377224,22.0625 21,21.439724 21,20.65625 L 21,11.375 C 21,10.591526 20.377224,9.96875 19.59375,9.96875 l -0.5625,0 0,-3.03125 c 0,-3.2851535 -2.683596,-5.96875 -5.96875,-5.96875 l -2.03125,0 z m 0,3 2.03125,0 c 1.675045,0 2.96875,1.2937048 2.96875,2.96875 l 0,3.03125 -7.96875,0 0,-3.03125 c 0,-1.6750452 1.293705,-2.96875 2.96875,-2.96875 z"
+  fill="ButtonText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-security-small-disabled.svg b/mail/themes/gnomestripe/mail/compose/button-security-small-disabled.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-security-small-disabled.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="M 6.65625,1 C 4.6546955,1 3,2.6278872 3,4.625 L 3,7 2.9375,7 C 2.4267736,7 2,7.4267736 2,7.9375 l 0,6.125 C 2,14.573226 2.4267736,15 2.9375,15 l 10.15625,0 c 0.510726,0 0.9375,-0.426774 0.9375,-0.9375 l 0,-6.125 C 14.03125,7.4267736 13.604476,7 13.09375,7 l -0.0625,0 0,-2.375 C 13.03125,2.6278869 11.376554,1 9.375,1 L 6.65625,1 z m 0,2 2.71875,0 c 0.940329,0 1.65625,0.7136131 1.65625,1.625 l 0,2.375 L 5,7 5,4.625 C 5,3.7136128 5.7159201,3 6.65625,3 z"
+  fill="GrayText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-security-small-hover.svg b/mail/themes/gnomestripe/mail/compose/button-security-small-hover.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-security-small-hover.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="M 6.65625,1 C 4.6546955,1 3,2.6278872 3,4.625 L 3,7 2.9375,7 C 2.4267736,7 2,7.4267736 2,7.9375 l 0,6.125 C 2,14.573226 2.4267736,15 2.9375,15 l 10.15625,0 c 0.510726,0 0.9375,-0.426774 0.9375,-0.9375 l 0,-6.125 C 14.03125,7.4267736 13.604476,7 13.09375,7 l -0.0625,0 0,-2.375 C 13.03125,2.6278869 11.376554,1 9.375,1 L 6.65625,1 z m 0,2 2.71875,0 c 0.940329,0 1.65625,0.7136131 1.65625,1.625 l 0,2.375 L 5,7 5,4.625 C 5,3.7136128 5.7159201,3 6.65625,3 z"
+  fill="ButtonText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-security-small.svg b/mail/themes/gnomestripe/mail/compose/button-security-small.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-security-small.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="M 6.65625,1 C 4.6546955,1 3,2.6278872 3,4.625 L 3,7 2.9375,7 C 2.4267736,7 2,7.4267736 2,7.9375 l 0,6.125 C 2,14.573226 2.4267736,15 2.9375,15 l 10.15625,0 c 0.510726,0 0.9375,-0.426774 0.9375,-0.9375 l 0,-6.125 C 14.03125,7.4267736 13.604476,7 13.09375,7 l -0.0625,0 0,-2.375 C 13.03125,2.6278869 11.376554,1 9.375,1 L 6.65625,1 z m 0,2 2.71875,0 c 0.940329,0 1.65625,0.7136131 1.65625,1.625 l 0,2.375 L 5,7 5,4.625 C 5,3.7136128 5.7159201,3 6.65625,3 z"
+  fill="-moz-menubartext"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-security.svg b/mail/themes/gnomestripe/mail/compose/button-security.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-security.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="m 11.03125,0.96875 c -3.285154,0 -5.96875,2.6835965 -5.96875,5.96875 l 0,3.03125 -0.65625,0 C 3.622776,9.96875 3,10.591526 3,11.375 l 0,9.28125 c 0,0.783474 0.622776,1.40625 1.40625,1.40625 l 15.1875,0 C 20.377224,22.0625 21,21.439724 21,20.65625 L 21,11.375 C 21,10.591526 20.377224,9.96875 19.59375,9.96875 l -0.5625,0 0,-3.03125 c 0,-3.2851535 -2.683596,-5.96875 -5.96875,-5.96875 l -2.03125,0 z m 0,3 2.03125,0 c 1.675045,0 2.96875,1.2937048 2.96875,2.96875 l 0,3.03125 -7.96875,0 0,-3.03125 c 0,-1.6750452 1.293705,-2.96875 2.96875,-2.96875 z"
+  fill="-moz-menubartext"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-send-disabled.svg b/mail/themes/gnomestripe/mail/compose/button-send-disabled.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-send-disabled.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="M 13,3 13,4 11,4 11,3 8,3 8,4 6,4 6,3 3.0176389,3 3,6 4,6 4,8 3.0176389,8.012971 3.0176389,11 4,11 4,13 3,13 3,16 4,16 4,18 3,18.0041 3,21 6,21 6,20 8.0006409,20 8,21 l 3,0 0,-1 2,0 0,0.991181 3,0 L 16,20 l 2,0 0,0.991181 3.008819,0 L 21,18 l -1,0 0,-2 1.008819,0 0,-3 L 20,13 l 0,-2 1,0 0,-3 -1,0 0,-2 1.008819,0 0,-3 L 18,3 18,4 16,4 16,3 z M 6,6 18,6 18,18 6,18 z m 1,1 0,10 10,0 0,-10 z"
+  fill="GrayText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-send-hover.svg b/mail/themes/gnomestripe/mail/compose/button-send-hover.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-send-hover.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="M 13,3 13,4 11,4 11,3 8,3 8,4 6,4 6,3 3.0176389,3 3,6 4,6 4,8 3.0176389,8.012971 3.0176389,11 4,11 4,13 3,13 3,16 4,16 4,18 3,18.0041 3,21 6,21 6,20 8.0006409,20 8,21 l 3,0 0,-1 2,0 0,0.991181 3,0 L 16,20 l 2,0 0,0.991181 3.008819,0 L 21,18 l -1,0 0,-2 1.008819,0 0,-3 L 20,13 l 0,-2 1,0 0,-3 -1,0 0,-2 1.008819,0 0,-3 L 18,3 18,4 16,4 16,3 z M 6,6 18,6 18,18 6,18 z m 1,1 0,10 10,0 0,-10 z"
+  fill="ButtonText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-send-small-disabled.svg b/mail/themes/gnomestripe/mail/compose/button-send-small-disabled.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-send-small-disabled.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="m 11.65625,0.96875 0,1.03125 -2.03125,0 0,-1 -3,0 0,1 -2.03125,0 0,-1 L 1,1 l 0,3.5625 1.03125,0 0,2.0625 -1.0625,0 0,2.96875 0.96875,0 0.03125,2 -1.03125,-0.03125 0,3.4375 3.6875,0.03125 0,-1.03125 2.03125,0 0,1 2.9375,0 0,-1 2,0 0,1 3.4375,0 0,-3.40625 -1,0 0,-1.96875 0.96875,0 0,-2.96875 -0.96875,0 0,-2.03125 1,0 0,-3.65625 -3.375,0 z M 4.03125,4 12,4 l 0,8 -7.96875,0 0,-0.5 0,-7.5 z m 1,1 0,6 L 11,11 11,5 5.03125,5 z"
+  fill="GrayText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-send-small-hover.svg b/mail/themes/gnomestripe/mail/compose/button-send-small-hover.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-send-small-hover.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="m 11.65625,0.96875 0,1.03125 -2.03125,0 0,-1 -3,0 0,1 -2.03125,0 0,-1 L 1,1 l 0,3.5625 1.03125,0 0,2.0625 -1.0625,0 0,2.96875 0.96875,0 0.03125,2 -1.03125,-0.03125 0,3.4375 3.6875,0.03125 0,-1.03125 2.03125,0 0,1 2.9375,0 0,-1 2,0 0,1 3.4375,0 0,-3.40625 -1,0 0,-1.96875 0.96875,0 0,-2.96875 -0.96875,0 0,-2.03125 1,0 0,-3.65625 -3.375,0 z M 4.03125,4 12,4 l 0,8 -7.96875,0 0,-0.5 0,-7.5 z m 1,1 0,6 L 11,11 11,5 5.03125,5 z"
+  fill="ButtonText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-send-small.svg b/mail/themes/gnomestripe/mail/compose/button-send-small.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-send-small.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="m 11.65625,0.96875 0,1.03125 -2.03125,0 0,-1 -3,0 0,1 -2.03125,0 0,-1 L 1,1 l 0,3.5625 1.03125,0 0,2.0625 -1.0625,0 0,2.96875 0.96875,0 0.03125,2 -1.03125,-0.03125 0,3.4375 3.6875,0.03125 0,-1.03125 2.03125,0 0,1 2.9375,0 0,-1 2,0 0,1 3.4375,0 0,-3.40625 -1,0 0,-1.96875 0.96875,0 0,-2.96875 -0.96875,0 0,-2.03125 1,0 0,-3.65625 -3.375,0 z M 4.03125,4 12,4 l 0,8 -7.96875,0 0,-0.5 0,-7.5 z m 1,1 0,6 L 11,11 11,5 5.03125,5 z"
+  fill="-moz-menubartext"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-send.svg b/mail/themes/gnomestripe/mail/compose/button-send.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-send.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="M 13,3 13,4 11,4 11,3 8,3 8,4 6,4 6,3 3.0176389,3 3,6 4,6 4,8 3.0176389,8.012971 3.0176389,11 4,11 4,13 3,13 3,16 4,16 4,18 3,18.0041 3,21 6,21 6,20 8.0006409,20 8,21 l 3,0 0,-1 2,0 0,0.991181 3,0 L 16,20 l 2,0 0,0.991181 3.008819,0 L 21,18 l -1,0 0,-2 1.008819,0 0,-3 L 20,13 l 0,-2 1,0 0,-3 -1,0 0,-2 1.008819,0 0,-3 L 18,3 18,4 16,4 16,3 z M 6,6 18,6 18,18 6,18 z m 1,1 0,10 10,0 0,-10 z"
+  fill="-moz-menubartext"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-spelling-disabled.svg b/mail/themes/gnomestripe/mail/compose/button-spelling-disabled.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-spelling-disabled.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="M 8.0492568,16.250103 C 7.2242621,14.838966 6.3453683,13.546349 5.2977568,12.40226 L 2.996628,14.508934 c 1.6990783,1.602355 2.811959,3.576483 4.037656,6.519436 L 9.9342062,20.98904 C 11.78016,13.585891 15.537115,7.7470513 21.002243,4.356367 13.602737,5.9963797 9.7024531,12.332086 8.0492568,16.250099 z"
+  fill="GrayText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-spelling-hover.svg b/mail/themes/gnomestripe/mail/compose/button-spelling-hover.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-spelling-hover.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="M 8.0492568,16.250103 C 7.2242621,14.838966 6.3453683,13.546349 5.2977568,12.40226 L 2.996628,14.508934 c 1.6990783,1.602355 2.811959,3.576483 4.037656,6.519436 L 9.9342062,20.98904 C 11.78016,13.585891 15.537115,7.7470513 21.002243,4.356367 13.602737,5.9963797 9.7024531,12.332086 8.0492568,16.250099 z"
+  fill="ButtonText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-spelling-small-disabled.svg b/mail/themes/gnomestripe/mail/compose/button-spelling-small-disabled.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-spelling-small-disabled.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="M 5.6654935,10.592071 C 5.0705085,9.574361 4.4366515,8.642127 3.6811155,7.817012 l -1.659571,1.51933 c 1.225373,1.155617 2.027981,2.579355 2.911952,4.701809 l 2.09142,-0.02837 C 8.3562155,8.670645 11.065726,4.459682 15.007169,2.014325 9.6706565,3.1971 6.8577765,7.766403 5.6654935,10.592068 z"
+  fill="GrayText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-spelling-small-hover.svg b/mail/themes/gnomestripe/mail/compose/button-spelling-small-hover.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-spelling-small-hover.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="M 5.6654935,10.592071 C 5.0705085,9.574361 4.4366515,8.642127 3.6811155,7.817012 l -1.659571,1.51933 c 1.225373,1.155617 2.027981,2.579355 2.911952,4.701809 l 2.09142,-0.02837 C 8.3562155,8.670645 11.065726,4.459682 15.007169,2.014325 9.6706565,3.1971 6.8577765,7.766403 5.6654935,10.592068 z"
+  fill="ButtonText"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-spelling-small.svg b/mail/themes/gnomestripe/mail/compose/button-spelling-small.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-spelling-small.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="M 5.6654935,10.592071 C 5.0705085,9.574361 4.4366515,8.642127 3.6811155,7.817012 l -1.659571,1.51933 c 1.225373,1.155617 2.027981,2.579355 2.911952,4.701809 l 2.09142,-0.02837 C 8.3562155,8.670645 11.065726,4.459682 15.007169,2.014325 9.6706565,3.1971 6.8577765,7.766403 5.6654935,10.592068 z"
+  fill="-moz-menubartext"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/button-spelling.svg b/mail/themes/gnomestripe/mail/compose/button-spelling.svg
new file mode 100644
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/compose/button-spelling.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="M 8.0492568,16.250103 C 7.2242621,14.838966 6.3453683,13.546349 5.2977568,12.40226 L 2.996628,14.508934 c 1.6990783,1.602355 2.811959,3.576483 4.037656,6.519436 L 9.9342062,20.98904 C 11.78016,13.585891 15.537115,7.7470513 21.002243,4.356367 13.602737,5.9963797 9.7024531,12.332086 8.0492568,16.250099 z"
+  fill="-moz-menubartext"/>
+</svg>
diff --git a/mail/themes/gnomestripe/mail/compose/messengercompose.css b/mail/themes/gnomestripe/mail/compose/messengercompose.css
--- a/mail/themes/gnomestripe/mail/compose/messengercompose.css
+++ b/mail/themes/gnomestripe/mail/compose/messengercompose.css
@@ -65,166 +65,285 @@ toolbox[labelalign="end"] > toolbar[mode
   -moz-padding-start: 2px;
 }
 
 toolbox[labelalign="end"] > toolbar[mode="full"] deck .toolbarbutton-text {
   text-align: start;
 }
 
 #button-send {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(198px 22px 220px 0px);
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-send.svg") !important;
+  -moz-image-region: auto !important;
+}
+
+#button-send:hover {
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-send-hover.svg") !important;
+  -moz-image-region: auto !important;
 }
 
 #button-send[disabled="true"] {
-  -moz-image-region: rect(176px 22px 198px 0px) !important;
-} 
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-send-disabled.svg") !important;
+  -moz-image-region: auto !important;
+}
 
 #button-contacts {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(22px 22px 44px 0px) !important;
+  list-style-image: url("chrome://messenger/skin/icons/button-address.svg");
+  -moz-image-region: auto !important;
+}
+
+#button-contacts:hover {
+  list-style-image: url("chrome://messenger/skin/icons/button-address-hover.svg");
+  -moz-image-region: auto !important;
 }
 
 #button-contacts[disabled="true"] {
-  -moz-image-region: rect(0px 22px 22px 0px) !important;
+  list-style-image: url("chrome://messenger/skin/icons/button-address-disabled.svg");
+  -moz-image-region: auto !important;
 } 
 
 #spellingButton {
-  list-style-image: url("moz-icon://stock/gtk-spell-check?size=toolbar");
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-spelling.svg");
+  -moz-image-region: auto !important;
+}
+
+#spellingButton:hover {
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-spelling-hover.svg");
+  -moz-image-region: auto !important;
 }
 
 #spellingButton[disabled="true"] {
-  list-style-image: url("moz-icon://stock/tools-check-spelling?size=toolbar&state=disabled");
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-spelling-disabled.svg");
+  -moz-image-region: auto !important;
 }
 
 #button-attach {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(66px 22px 88px 0px);
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-attach.svg");
+  -moz-image-region: auto !important;
+}
+
+#button-attach:hover {
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-attach-hover.svg");
+  -moz-image-region: auto !important;
 }
 
 #button-attach[disabled="true"] {
-  -moz-image-region: rect(44px 22px 66px 0px) !important;
-} 
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-attach-disabled.svg");
+  -moz-image-region: auto !important;
+}
 
 #button-save {
-  list-style-image: url("moz-icon://stock/gtk-save?size=toolbar");
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-save.svg");
+  -moz-image-region: auto !important;
+}
+
+#button-save:hover {
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-save-hover.svg");
+  -moz-image-region: auto !important;
 }
 
 #button-save[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-save?size=toolbar&state=disabled");
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-save-disabled.svg");
+  -moz-image-region: auto !important;
 }
 
 #quoteButton {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(110px 22px 132px 0px);
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-quote.svg");
+  -moz-image-region: auto !important;
+}
+
+#quoteButton:hover {
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-quote-hover.svg");
+  -moz-image-region: auto !important;
 }
 
 #quoteButton[disabled="true"] {
-  -moz-image-region: rect(88px 22px 110px 0px) !important;
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-quote-disabled.svg");
+  -moz-image-region: auto !important;
 }
 
 #cut-button {
-  list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar");
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-cut.svg");
+  -moz-image-region: auto !important;
+}
+
+#cut-button:hover {
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-cut-hover.svg");
+  -moz-image-region: auto !important;
 }
 
 #cut-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar&state=disabled");
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-cut-disabled.svg");
+  -moz-image-region: auto !important;
 }
 
 #copy-button {
-  list-style-image: url("moz-icon://stock/gtk-copy?size=toolbar");
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-copy.svg");
+  -moz-image-region: auto !important;
+}
+
+#copy-button:hover {
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-copy-hover.svg");
+  -moz-image-region: auto !important;
 }
 
 #copy-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-copy?size=toolbar&state=disabled");
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-copy-disabled.svg");
+  -moz-image-region: auto !important;
 }
 
 #paste-button {
-  list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar");
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-paste.svg");
+  -moz-image-region: auto !important;
+}
+
+#paste-button:hover{
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-paste-hover.svg");
+  -moz-image-region: auto !important;
 }
 
 #paste-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar&state=disabled");
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-paste-disabled.svg");
+  -moz-image-region: auto !important;
 }
 
 /* ::::: small primary toolbar buttons ::::: */
 
 toolbar[iconsize="small"] #button-send {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-small.png");
-  -moz-image-region: rect(144px 16px 160px 0px);
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-send-small.svg") !important;
+  -moz-image-region: auto !important;
 }
 
-toolbar[iconsize="small"] #button-send[disabled] {
-  -moz-image-region: rect(128px 16px 144px 0px) !important;
+toolbar[iconsize="small"] #button-send:hover {
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-send-small-hover.svg") !important;
+  -moz-image-region: auto !important;
+}
+
+toolbar[iconsize="small"] #button-send[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-send-small-disabled.svg") !important;
+  -moz-image-region: auto !important;
 } 
 
 toolbar[iconsize="small"] #button-contacts {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-small.png");
-  -moz-image-region: rect(16px 16px 32px 0px) !important;
+  list-style-image: url("chrome://messenger/skin/icons/button-address-small.svg");
+  -moz-image-region: auto !important;
 }
 
-toolbar[iconsize="small"] #button-contacts[disabled] {
-  -moz-image-region: rect(0px 16px 16px 0px) !important;
+toolbar[iconsize="small"] #button-contacts:hover {
+  list-style-image: url("chrome://messenger/skin/icons/button-address-small-hover.svg");
+  -moz-image-region: auto !important;
+}
+
+toolbar[iconsize="small"] #button-contacts[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/button-address-small-disabled.svg");
+  -moz-image-region: auto !important;
 } 
 
 toolbar[iconsize="small"] #spellingButton {
-  list-style-image: url("moz-icon://stock/gtk-spell-check?size=menu");
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-spelling-small.svg");
+  -moz-image-region: auto !important;
+}
+
+toolbar[iconsize="small"] #spellingButton:hover {
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-spelling-small-hover.svg");
+  -moz-image-region: auto !important;
 }
 
 toolbar[iconsize="small"] #spellingButton[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-spell-check?size=menu&state=disabled");
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-spelling-small-disabled.svg");
+  -moz-image-region: auto !important;
 }
 
 toolbar[iconsize="small"] #button-attach {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-small.png");
-  -moz-image-region: rect(48px 16px 64px 0px);
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-attach-small.svg");
+  -moz-image-region: auto !important;
 }
 
-toolbar[iconsize="small"] #button-attach[disabled] {
-  -moz-image-region: rect(32px 16px 48px 0px) !important;
-} 
+toolbar[iconsize="small"] #button-attach:hover {
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-attach-small-hover.svg");
+  -moz-image-region: auto !important;
+}
+
+toolbar[iconsize="small"] #button-attach[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-attach-small-disabled.svg");
+  -moz-image-region: auto !important;
+}
 
 toolbar[iconsize="small"] #button-save {
-  list-style-image: url("moz-icon://stock/gtk-save?size=menu");
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-save-small.svg");
+  -moz-image-region: auto !important;
 }
 
-toolbar[iconsize="small"] #button-save[disabled] {
-  list-style-image: url("moz-icon://stock/gtk-save?size=menu&state=disabled");
+toolbar[iconsize="small"] #button-save:hover {
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-save-small-hover.svg");
+  -moz-image-region: auto !important;
+}
+
+toolbar[iconsize="small"] #button-save[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-save-small-disabled.svg");
+  -moz-image-region: auto !important;
 }
 
 toolbar[iconsize="small"] #quoteButton {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-small.png");
-  -moz-image-region: rect(80px 16px 96px 0px);
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-quote-small.svg");
+  -moz-image-region: auto !important;
+}
+
+toolbar[iconsize="small"] #quoteButton:hover {
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-quote-small-hover.svg");
+  -moz-image-region: auto !important;
 }
 
 toolbar[iconsize="small"] #quoteButton[disabled="true"] {
-  -moz-image-region: rect(64px 16px 80px 0px) !important;
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-quote-small-disabled.svg");
+  -moz-image-region: auto !important;
 }
 
 toolbar[iconsize="small"] #cut-button {
-  list-style-image: url("moz-icon://stock/gtk-cut?size=menu");
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-cut-small.svg");
+  -moz-image-region: auto !important;
+}
+
+toolbar[iconsize="small"] #cut-button:hover {
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-cut-small-hover.svg");
+  -moz-image-region: auto !important;
 }
 
 toolbar[iconsize="small"] #cut-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-cut?size=menu&state=disabled");
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-cut-small-disabled.svg");
+  -moz-image-region: auto !important;
 }
 
 toolbar[iconsize="small"] #copy-button {
-  list-style-image: url("moz-icon://stock/gtk-copy?size=menu");
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-copy-small.svg");
+  -moz-image-region: auto !important;
+}
+
+toolbar[iconsize="small"] #copy-button:hover {
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-copy-small-hover.svg");
+  -moz-image-region: auto !important;
 }
 
 toolbar[iconsize="small"] #copy-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-copy?size=menu&state=disabled");
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-copy-small-disabled.svg");
+  -moz-image-region: auto !important;
 }
+
 toolbar[iconsize="small"] #paste-button {
-  list-style-image: url("moz-icon://stock/gtk-paste?size=menu");
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-paste-small.svg");
+  -moz-image-region: auto !important;
+}
+
+toolbar[iconsize="small"] #paste-button:hover{
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-paste-small-hover.svg");
+  -moz-image-region: auto !important;
 }
 
 toolbar[iconsize="small"] #paste-button[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-paste?size=menu&state=disabled");
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-paste-small-disabled.svg");
+  -moz-image-region: auto !important;
 }
 
 #priority-button:not(:-moz-lwtheme) > label {
   color: MenuText;
 }
 
 /* ::::: special toolbar colors ::::: */
 
diff --git a/mail/themes/gnomestripe/mail/smime/msgCompSMIMEOverlay.css b/mail/themes/gnomestripe/mail/smime/msgCompSMIMEOverlay.css
--- a/mail/themes/gnomestripe/mail/smime/msgCompSMIMEOverlay.css
+++ b/mail/themes/gnomestripe/mail/smime/msgCompSMIMEOverlay.css
@@ -36,32 +36,44 @@
 
 /* ===== msgCompSMIMEOverlay.css ========================================
   == Styles for the S/Mime in composer window.
   ======================================================================= */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #button-security {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
-  -moz-image-region: rect(154px 22px 176px 0px);
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-security.svg");
+  -moz-image-region: auto !important;
+}
+
+#button-security:hover {
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-security-hover.svg");
+  -moz-image-region: auto !important;
 }
 
 #button-security[disabled="true"] {
-  -moz-image-region: rect(132px 22px 154px 0px);
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-security-disabled.svg");
+  -moz-image-region: auto !important;
 }
 
 
 toolbar[iconsize="small"] #button-security {
-  list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-small.png");
-  -moz-image-region: rect(112px 16px 128px 0px);
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-security-small.svg");
+  -moz-image-region: auto !important;
 }
 
-toolbar[iconsize="small"] #button-security[disabled] {
-  -moz-image-region: rect(96px 16px 112px 0px);
+toolbar[iconsize="small"] #button-security:hover {
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-security-small-hover.svg");
+  -moz-image-region: auto !important;
+}
+
+toolbar[iconsize="small"] #button-security[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/messengercompose/button-security-small-disabled.svg");
+  -moz-image-region: auto !important;
 }
 
 #msgcomposeWindow #signing-status {
   list-style-image: none;
   visibility: collapse;
 }
 
 #msgcomposeWindow[signing="ok"] #signing-status {