# HG changeset patch
# Parent 44546ef161af3817dd5c24513c351e9cc4323633

--- a/mail/themes/gnomestripe/jar.mn
+++ b/mail/themes/gnomestripe/jar.mn
@@ -71,8 +71,30 @@ classic.jar:
   skin/classic/messenger/addressbook/icons/ablist.png         (mail/addrbook/ablist.png)
   skin/classic/messenger/addressbook/icons/contact-generic.png             (mail/addrbook/contact-generic.png)
   skin/classic/messenger/addressbook/icons/contact-generic-tiny.png        (mail/addrbook/contact-generic-tiny.png)
-  skin/classic/messenger/addressbook/icons/addressbook-toolbar.png         (mail/addrbook/addressbook-toolbar.png)
-  skin/classic/messenger/addressbook/icons/addressbook-toolbar-small.png   (mail/addrbook/addressbook-toolbar-small.png)
+  skin/classic/messenger/addressbook/icons/button-info-disabled.svg        (mail/addrbook/button-info-disabled.svg)
+  skin/classic/messenger/addressbook/icons/button-info-hover.svg           (mail/addrbook/button-info-hover.svg)
+  skin/classic/messenger/addressbook/icons/button-info-small-disabled.svg  (mail/addrbook/button-info-small-disabled.svg)
+  skin/classic/messenger/addressbook/icons/button-info-small-hover.svg     (mail/addrbook/button-info-small-hover.svg)
+  skin/classic/messenger/addressbook/icons/button-info-small.svg           (mail/addrbook/button-info-small.svg)
+  skin/classic/messenger/addressbook/icons/button-info.svg                 (mail/addrbook/button-info.svg)
+  skin/classic/messenger/addressbook/icons/button-newcard-disabled.svg     (mail/addrbook/button-newcard-disabled.svg)
+  skin/classic/messenger/addressbook/icons/button-newcard-hover.svg        (mail/addrbook/button-newcard-hover.svg)
+  skin/classic/messenger/addressbook/icons/button-newcard-small-disabled.svg  (mail/addrbook/button-newcard-small-disabled.svg)
+  skin/classic/messenger/addressbook/icons/button-newcard-small-hover.svg  (mail/addrbook/button-newcard-small-hover.svg)
+  skin/classic/messenger/addressbook/icons/button-newcard-small.svg        (mail/addrbook/button-newcard-small.svg)
+  skin/classic/messenger/addressbook/icons/button-newcard.svg              (mail/addrbook/button-newcard.svg)
+  skin/classic/messenger/addressbook/icons/button-newim-disabled.svg       (mail/addrbook/button-newim-disabled.svg)
+  skin/classic/messenger/addressbook/icons/button-newim-hover.svg          (mail/addrbook/button-newim-hover.svg)
+  skin/classic/messenger/addressbook/icons/button-newim-small-disabled.svg  (mail/addrbook/button-newim-small-disabled.svg)
+  skin/classic/messenger/addressbook/icons/button-newim-small-hover.svg    (mail/addrbook/button-newim-small-hover.svg)
+  skin/classic/messenger/addressbook/icons/button-newim-small.svg          (mail/addrbook/button-newim-small.svg)
+  skin/classic/messenger/addressbook/icons/button-newim.svg                (mail/addrbook/button-newim.svg)
+  skin/classic/messenger/addressbook/icons/button-newlist-disabled.svg     (mail/addrbook/button-newlist-disabled.svg)
+  skin/classic/messenger/addressbook/icons/button-newlist-hover.svg        (mail/addrbook/button-newlist-hover.svg)
+  skin/classic/messenger/addressbook/icons/button-newlist-small-disabled.svg  (mail/addrbook/button-newlist-small-disabled.svg)
+  skin/classic/messenger/addressbook/icons/button-newlist-small-hover.svg  (mail/addrbook/button-newlist-small-hover.svg)
+  skin/classic/messenger/addressbook/icons/button-newlist-small.svg        (mail/addrbook/button-newlist-small.svg)
+  skin/classic/messenger/addressbook/icons/button-newlist.svg              (mail/addrbook/button-newlist.svg)
   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)
--- a/mail/themes/gnomestripe/mail/addrbook/addressbook.css
+++ b/mail/themes/gnomestripe/mail/addrbook/addressbook.css
@@ -71,111 +71,185 @@ toolbox[labelalign="end"] > toolbar[mode
 }
 
 #button-newcard {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(44px 22px 66px 0px); /* contact-add.png */
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-newcard.svg") !important;
+  -moz-image-region: auto !important;
+}
+
+#button-newcard:hover {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-newcard-hover.svg") !important;
+  -moz-image-region: auto !important;
 }
 
 #button-newcard[disabled="true"] {
-  -moz-image-region: rect(66px 22px 88px 0px); /* contact-add-disabled.png */
-} 
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-newcard-disabled.svg") !important;
+  -moz-image-region: auto !important;
+}
 
 #button-newlist {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(88px 22px 110px 0px); /* contact-list-add.png */
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-newlist.svg") !important;
+  -moz-image-region: auto !important;
+}
+
+#button-newlist:hover {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-newlist-hover.svg") !important;
+  -moz-image-region: auto !important;
 }
 
 #button-newlist[disabled="true"] {
-  -moz-image-region: rect(110px 22px 132px 0px); /* contact-list-add-disabled.png */
-} 
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-newlist-disabled.svg") !important;
+  -moz-image-region: auto !important;
+}
 
 #button-editcard {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(132px 22px 154px 0px); /* contact-properties.png */
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-info.svg") !important;
+  -moz-image-region: auto !important;
+}
+
+#button-editcard:hover {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-info-hover.svg") !important;
+  -moz-image-region: auto !important;
 }
 
 #button-editcard[disabled="true"] {
-  -moz-image-region: rect(154px 22px 176px 0px); /* contact-properties-disabled.png */
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-info-disabled.svg") !important;
+  -moz-image-region: auto !important;
 }
 
 #button-newmessage {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(176px 22px 198px 0px); /* message-compose.png */
+  list-style-image: url("chrome://messenger/skin/icons/button-newmsg.svg") !important;
+  -moz-image-region: auto !important;
+}
+
+#button-newmessage:hover {
+  list-style-image: url("chrome://messenger/skin/icons/button-newmsg-hover.svg") !important;
+  -moz-image-region: auto !important;
 }
 
-#button-newmessage[disabled] {
-  -moz-image-region: rect(198px 22px 220px 0px); /* message-compose-disabled.png */
+#button-newmessage[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/button-newmsg-disabled.svg") !important;
+  -moz-image-region: auto !important;
 }
 
 #button-newim {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(0px 22px 22px 0px); /* chat-new.png */
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-newim.svg") !important;
+  -moz-image-region: auto !important;
 }
  
-#button-newim[disabled] {
-  -moz-image-region: rect(22px 22px 44px 0px); /* chat-new-disabled.png */
-} 
+#button-newim:hover {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-newim-hover.svg") !important;
+  -moz-image-region: auto !important;
+}
+
+#button-newim[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-newim-disabled.svg") !important;
+  -moz-image-region: auto !important;
+}
 
 #button-abdelete {
-  list-style-image: url("moz-icon://stock/gtk-delete?size=toolbar")
+  list-style-image: url("chrome://messenger/skin/icons/button-delete.svg") !important;
+  -moz-image-region: auto !important;
 }
 
-#button-abdelete[disabled] {
-  list-style-image: url("moz-icon://stock/gtk-delete?size=toolbar&state=disabled")
+#button-abdelete:hover {
+  list-style-image: url("chrome://messenger/skin/icons/button-delete-hover.svg") !important;
+  -moz-image-region: auto !important;
+}
+
+#button-abdelete[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/button-delete-disabled.svg") !important;
+  -moz-image-region: auto !important;
 }
 
 /* ::::: small primary toolbar buttons ::::: */
 
 toolbar[iconsize="small"] #button-newcard {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png");
-  -moz-image-region: rect(32px 16px 48px 0px); /* contact-add-small.png */
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-newcard-small.svg") !important;
+  -moz-image-region: auto !important;
+}
+
+toolbar[iconsize="small"] #button-newcard:hover {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-newcard-small-hover.svg") !important;
+  -moz-image-region: auto !important;
 }
 
-toolbar[iconsize="small"] #button-newcard[disabled] {
-  -moz-image-region: rect(48px 16px 64px 0px); /* contact-add-small-disabled.png */
+toolbar[iconsize="small"] #button-newcard[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-newcard-small-disabled.svg") !important;
+  -moz-image-region: auto !important;
 }
 
 toolbar[iconsize="small"] #button-newlist {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png");
-  -moz-image-region: rect(64px 16px 80px 0px); /* contact-list-add-small.png */
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-newlist-small.svg") !important;
+  -moz-image-region: auto !important;
 }
 
-toolbar[iconsize="small"] #button-newlist[disabled] {
-  -moz-image-region: rect(80px 16px 96px 0px); /* contact-list-add-small-disabled.png */
+toolbar[iconsize="small"] #button-newlist:hover {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-newlist-small-hover.svg") !important;
+  -moz-image-region: auto !important;
+}
+
+toolbar[iconsize="small"] #button-newlist[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-newlist-small-disabled.svg") !important;
+  -moz-image-region: auto !important;
 }
 
 toolbar[iconsize="small"] #button-editcard {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png");
-  -moz-image-region: rect(96px 16px 112px 0px); /* contact-properties-small.png */
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-info-small.svg") !important;
+  -moz-image-region: auto !important;
+}
+
+toolbar[iconsize="small"] #button-editcard:hover {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-info-small-hover.svg") !important;
+  -moz-image-region: auto !important;
 }
 
 toolbar[iconsize="small"] #button-editcard[disabled="true"] {
-  -moz-image-region: rect(112px 16px 128px 0px); /* contact-properties-small-disabled.png */
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-info-small-disabled.svg") !important;
+  -moz-image-region: auto !important;
 }
 
 toolbar[iconsize="small"] #button-newmessage {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png");
-  -moz-image-region: rect(128px 16px 144px 0px); /* message-compose-small.png */
+  list-style-image: url("chrome://messenger/skin/icons/button-newmsg-small.svg") !important;
+  -moz-image-region: auto !important;
 }
 
-toolbar[iconsize="small"] #button-newmessage[disabled] {
-  -moz-image-region: rect(144px 16px 160px 0px); /* message-compose-small-disabled.png */
+toolbar[iconsize="small"] #button-newmessage:hover {
+  list-style-image: url("chrome://messenger/skin/icons/button-newmsg-small-hover.svg") !important;
+  -moz-image-region: auto !important;
+}
+
+toolbar[iconsize="small"] #button-newmessage[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/button-newmsg-small-disabled.svg") !important;
+  -moz-image-region: auto !important;
 }
 
 toolbar[iconsize="small"] #button-newim {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png");
-  -moz-image-region: rect(0px 16px 16px 0px); /* chat-new-small.png */
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-newim-small.svg") !important;
+  -moz-image-region: auto !important;
+}
+
+toolbar[iconsize="small"] #button-newim:hover {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-newim-small-hover.svg") !important;
+  -moz-image-region: auto !important;
 }
 
-toolbar[iconsize="small"] #button-newim[disabled] {
-  -moz-image-region: rect(16px 16px 32px 0px); /* chat-new-small-disabled.png */
+toolbar[iconsize="small"] #button-newim[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-newim-small-disabled.svg") !important;
+  -moz-image-region: auto !important;
 }
 
 toolbar[iconsize="small"] #button-abdelete {
-  list-style-image: url("moz-icon://stock/gtk-delete?size=menu");
+  list-style-image: url("chrome://messenger/skin/icons/button-delete-small.svg") !important;
+  -moz-image-region: auto !important;
+}
+
+toolbar[iconsize="small"] #button-abdelete:hover {
+  list-style-image: url("chrome://messenger/skin/icons/button-delete-small-hover.svg") !important;
+  -moz-image-region: auto !important;
 }
 
-toolbar[iconsize="small"] #button-abdelete[disabled] {
-  list-style-image: url("moz-icon://stock/gtk-delete?size=menu&state=disabled");
+toolbar[iconsize="small"] #button-abdelete[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/button-delete-small-disabled.svg") !important;
+  -moz-image-region: auto !important;
 }
 
 #abContent {
@@ -349,25 +423,25 @@ html|p {
 
 #menu_newContact,
 #dirTreeContext-newcard {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png");
-  -moz-image-region: rect(32px 16px 48px 0px); /* contact-add-small.png */
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-newcard-small.svg") !important;
+  -moz-image-region: auto !important;
 }
 
 #menu_newList,
 #dirTreeContext-newlist {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png");
-  -moz-image-region: rect(64px 16px 80px 0px); /* contact-list-add-small.png */
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-newlist-small.svg") !important;
+  -moz-image-region: auto !important;
 }
 
 #menu_newMessage,
 #abResultsTreeContext-newmessage {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png");
-  -moz-image-region: rect(128px 16px 144px 0px); /* message-compose-small.png */
+  list-style-image: url("chrome://messenger/skin/icons/button-newmsg-small.svg") !important;
+  -moz-image-region: auto !important;
 }
 
 #abResultsTreeContext-newim {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png");
-  -moz-image-region: rect(0px 16px 16px 0px); /* chat-new-small.png */
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-newim-small.svg") !important;
+  -moz-image-region: auto !important;
 }
 
 #menu_search_addresses {
@@ -377,8 +451,8 @@ html|p {
 #menu_properties,
 #dirTreeContext-properties,
 #abResultsTreeContext-properties {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png");
-  -moz-image-region: rect(96px 16px 112px 0px); /* contact-properties-small.png */
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-info-small.svg") !important;
+  -moz-image-region: auto !important;
 }
 
 #dirTreeContext-delete,
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/addrbook/button-info-disabled.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="m 12,3 c -4.9705629,0 -9,4.0294372 -9,9 0,4.970564 4.0294371,9 9,9 4.970564,0 9,-4.029436 9,-9 0,-4.9705628 -4.029436,-9 -9,-9 z m -0.393918,5.0216039 0.84403,0 c 0.311625,0 0.5625,0.250875 0.5625,0.5625 l 0,0.8533961 c 0,0.311625 -0.250875,0.5625 -0.5625,0.5625 l -0.84403,0 c -0.311625,0 -0.5625,-0.250875 -0.5625,-0.5625 l 0,-0.8533961 c 0,-0.311625 0.250875,-0.5625 0.5625,-0.5625 z M 11,11 l 2,0 0,6 -2,0 z"
+  fill="GrayText"/>
+</svg>
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/addrbook/button-info-hover.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="m 12,3 c -4.9705629,0 -9,4.0294372 -9,9 0,4.970564 4.0294371,9 9,9 4.970564,0 9,-4.029436 9,-9 0,-4.9705628 -4.029436,-9 -9,-9 z m -0.393918,5.0216039 0.84403,0 c 0.311625,0 0.5625,0.250875 0.5625,0.5625 l 0,0.8533961 c 0,0.311625 -0.250875,0.5625 -0.5625,0.5625 l -0.84403,0 c -0.311625,0 -0.5625,-0.250875 -0.5625,-0.5625 l 0,-0.8533961 c 0,-0.311625 0.250875,-0.5625 0.5625,-0.5625 z M 11,11 l 2,0 0,6 -2,0 z"
+  fill="ButtonText"/>
+</svg>
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/addrbook/button-info-small-disabled.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="M 8 0 C 3.5817219 1.1842379e-15 0 3.5817219 0 8 C 0 12.418279 3.5817219 16 8 16 C 12.418279 16 16 12.418279 16 8 C 16 3.5817219 12.418279 0 8 0 z M 7.5 4 L 8.5 4 C 8.777 4 9 4.223 9 4.5 L 9 5.5 C 9 5.777 8.777 6 8.5 6 L 7.5 6 C 7.223 6 7 5.777 7 5.5 L 7 4.5 C 7 4.223 7.223 4 7.5 4 z M 7 7 L 9 7 L 9 13 L 7 13 L 7 7 z "
+  fill="GrayText"/>
+</svg>
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/addrbook/button-info-small-hover.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="M 8 0 C 3.5817219 1.1842379e-15 0 3.5817219 0 8 C 0 12.418279 3.5817219 16 8 16 C 12.418279 16 16 12.418279 16 8 C 16 3.5817219 12.418279 0 8 0 z M 7.5 4 L 8.5 4 C 8.777 4 9 4.223 9 4.5 L 9 5.5 C 9 5.777 8.777 6 8.5 6 L 7.5 6 C 7.223 6 7 5.777 7 5.5 L 7 4.5 C 7 4.223 7.223 4 7.5 4 z M 7 7 L 9 7 L 9 13 L 7 13 L 7 7 z "
+  fill="ButtonText"/>
+</svg>
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/addrbook/button-info-small.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="M 8 0 C 3.5817219 1.1842379e-15 0 3.5817219 0 8 C 0 12.418279 3.5817219 16 8 16 C 12.418279 16 16 12.418279 16 8 C 16 3.5817219 12.418279 0 8 0 z M 7.5 4 L 8.5 4 C 8.777 4 9 4.223 9 4.5 L 9 5.5 C 9 5.777 8.777 6 8.5 6 L 7.5 6 C 7.223 6 7 5.777 7 5.5 L 7 4.5 C 7 4.223 7.223 4 7.5 4 z M 7 7 L 9 7 L 9 13 L 7 13 L 7 7 z "
+  fill="MenuText"/>
+</svg>
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/addrbook/button-info.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="m 12,3 c -4.9705629,0 -9,4.0294372 -9,9 0,4.970564 4.0294371,9 9,9 4.970564,0 9,-4.029436 9,-9 0,-4.9705628 -4.029436,-9 -9,-9 z m -0.393918,5.0216039 0.84403,0 c 0.311625,0 0.5625,0.250875 0.5625,0.5625 l 0,0.8533961 c 0,0.311625 -0.250875,0.5625 -0.5625,0.5625 l -0.84403,0 c -0.311625,0 -0.5625,-0.250875 -0.5625,-0.5625 l 0,-0.8533961 c 0,-0.311625 0.250875,-0.5625 0.5625,-0.5625 z M 11,11 l 2,0 0,6 -2,0 z"
+  fill="MenuText"/>
+</svg>
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/addrbook/button-newcard-disabled.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="m 11.96875,2.96875 c -3.311164,0 -6,2.7065615 -6,6.03125 0,2.248664 1.2119558,4.185144 3.03125,5.21875 L 9,15 5.96875,15 C 4.3229999,15 3,16.363743 3,18.03125 L 3,23 21,23 21,18.03125 C 21,16.363743 19.676985,15 18.03125,15 L 15,15 15,14.15625 C 16.769972,13.109794 17.9375,11.211607 17.9375,9 c 0,-3.3246885 -2.657588,-6.03125 -5.96875,-6.03125 z M 11,6 l 2,0 0,2 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 0,-2 z"
+  fill="GrayText"/>
+</svg>
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/addrbook/button-newcard-hover.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="m 11.96875,2.96875 c -3.311164,0 -6,2.7065615 -6,6.03125 0,2.248664 1.2119558,4.185144 3.03125,5.21875 L 9,15 5.96875,15 C 4.3229999,15 3,16.363743 3,18.03125 L 3,23 21,23 21,18.03125 C 21,16.363743 19.676985,15 18.03125,15 L 15,15 15,14.15625 C 16.769972,13.109794 17.9375,11.211607 17.9375,9 c 0,-3.3246885 -2.657588,-6.03125 -5.96875,-6.03125 z M 11,6 l 2,0 0,2 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 0,-2 z"
+  fill="ButtonText"/>
+</svg>
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/addrbook/button-newcard-small-disabled.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+  <path
+     d="M 8.5,1 C 6.0147186,1 4,3.0147188 4,5.5 4,7.0680581 4.7837896,8.4444261 6,9.25 L 6,10 3.96875,10 C 2.87074,10 2,10.892 2,12 l 0,3.03125 13,0 L 15,12 c 0,-1.108 -0.87075,-2 -1.96875,-2 L 11,10 11,9.25 C 12.21621,8.4444261 13,7.0680581 13,5.5 13,3.0147188 10.985281,1 8.5,1 z M 8,3 9,3 9,5 11,5 11,6 9,6 9,8 8,8 8,6 6,6 6,5 8,5 8,3 z"
+  fill="GrayText"/>
+</svg>
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/addrbook/button-newcard-small-hover.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+  <path
+     d="M 8.5,1 C 6.0147186,1 4,3.0147188 4,5.5 4,7.0680581 4.7837896,8.4444261 6,9.25 L 6,10 3.96875,10 C 2.87074,10 2,10.892 2,12 l 0,3.03125 13,0 L 15,12 c 0,-1.108 -0.87075,-2 -1.96875,-2 L 11,10 11,9.25 C 12.21621,8.4444261 13,7.0680581 13,5.5 13,3.0147188 10.985281,1 8.5,1 z M 8,3 9,3 9,5 11,5 11,6 9,6 9,8 8,8 8,6 6,6 6,5 8,5 8,3 z"
+  fill="ButtonText"/>
+</svg>
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/addrbook/button-newcard-small.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+  <path
+     d="M 8.5,1 C 6.0147186,1 4,3.0147188 4,5.5 4,7.0680581 4.7837896,8.4444261 6,9.25 L 6,10 3.96875,10 C 2.87074,10 2,10.892 2,12 l 0,3.03125 13,0 L 15,12 c 0,-1.108 -0.87075,-2 -1.96875,-2 L 11,10 11,9.25 C 12.21621,8.4444261 13,7.0680581 13,5.5 13,3.0147188 10.985281,1 8.5,1 z M 8,3 9,3 9,5 11,5 11,6 9,6 9,8 8,8 8,6 6,6 6,5 8,5 8,3 z"
+  fill="MenuText"/>
+</svg>
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/addrbook/button-newcard.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="m 11.96875,2.96875 c -3.311164,0 -6,2.7065615 -6,6.03125 0,2.248664 1.2119558,4.185144 3.03125,5.21875 L 9,15 5.96875,15 C 4.3229999,15 3,16.363743 3,18.03125 L 3,23 21,23 21,18.03125 C 21,16.363743 19.676985,15 18.03125,15 L 15,15 15,14.15625 C 16.769972,13.109794 17.9375,11.211607 17.9375,9 c 0,-3.3246885 -2.657588,-6.03125 -5.96875,-6.03125 z M 11,6 l 2,0 0,2 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 0,-2 z"
+  fill="MenuText"/>
+</svg>
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/addrbook/button-newim-disabled.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="M 4.90625,4.03125 C 3.847781,4.03125 3,4.8790314 3,5.9375 l 0,9.1875 c 0,1.058469 0.847781,1.90625 1.90625,1.90625 l 8.15625,0 3.9375,4 0,-4 2.125,0 c 1.058469,0 1.90625,-0.847781 1.90625,-1.90625 l 0,-9.1875 c 0,-1.0584686 -0.847781,-1.90625 -1.90625,-1.90625 l -14.21875,0 z"
+  fill="GrayText"/>
+</svg>
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/addrbook/button-newim-hover.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="M 4.90625,4.03125 C 3.847781,4.03125 3,4.8790314 3,5.9375 l 0,9.1875 c 0,1.058469 0.847781,1.90625 1.90625,1.90625 l 8.15625,0 3.9375,4 0,-4 2.125,0 c 1.058469,0 1.90625,-0.847781 1.90625,-1.90625 l 0,-9.1875 c 0,-1.0584686 -0.847781,-1.90625 -1.90625,-1.90625 l -14.21875,0 z"
+  fill="ButtonText"/>
+</svg>
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/addrbook/button-newim-small-disabled.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="m 2.0945545,2.0450505 c -0.576124,0 -1.0625,0.455126 -1.0625,1.03125 l 0,7.9374995 c 0,0.576124 0.486376,1.03125 1.0625,1.03125 l 6.8125,0 3.1562495,3.03125 0,-3.03125 1.909072,0 c 0.576124,0 1.03125,-0.455126 1.03125,-1.03125 l 0,-7.9374995 c 0,-0.576124 -0.455126,-1.03125 -1.03125,-1.03125 z"
+  fill="GrayText"/>
+</svg>
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/addrbook/button-newim-small-hover.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="m 2.0945545,2.0450505 c -0.576124,0 -1.0625,0.455126 -1.0625,1.03125 l 0,7.9374995 c 0,0.576124 0.486376,1.03125 1.0625,1.03125 l 6.8125,0 3.1562495,3.03125 0,-3.03125 1.909072,0 c 0.576124,0 1.03125,-0.455126 1.03125,-1.03125 l 0,-7.9374995 c 0,-0.576124 -0.455126,-1.03125 -1.03125,-1.03125 z"
+  fill="ButtonText"/>
+</svg>
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/addrbook/button-newim-small.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+    <path
+       d="m 2.0945545,2.0450505 c -0.576124,0 -1.0625,0.455126 -1.0625,1.03125 l 0,7.9374995 c 0,0.576124 0.486376,1.03125 1.0625,1.03125 l 6.8125,0 3.1562495,3.03125 0,-3.03125 1.909072,0 c 0.576124,0 1.03125,-0.455126 1.03125,-1.03125 l 0,-7.9374995 c 0,-0.576124 -0.455126,-1.03125 -1.03125,-1.03125 z"
+  fill="MenuText"/>
+</svg>
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/addrbook/button-newim.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="M 4.90625,4.03125 C 3.847781,4.03125 3,4.8790314 3,5.9375 l 0,9.1875 c 0,1.058469 0.847781,1.90625 1.90625,1.90625 l 8.15625,0 3.9375,4 0,-4 2.125,0 c 1.058469,0 1.90625,-0.847781 1.90625,-1.90625 l 0,-9.1875 c 0,-1.0584686 -0.847781,-1.90625 -1.90625,-1.90625 l -14.21875,0 z"
+  fill="MenuText"/>
+</svg>
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/addrbook/button-newlist-disabled.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="m 13.53125,1.96875 c -3.039395,0 -5.5,2.4606049 -5.5,5.5 0,2.125635 1.2054528,3.959242 2.96875,4.875 L 11,14 7.75,14 C 6.2413957,14 5.03125,15.252702 5.03125,16.78125 L 5.03125,21 22,21 22,16.78125 C 22,15.252702 20.789763,14.015254 19.28125,14 l -3.1875,0 0,-1.65625 c 1.749204,-0.920287 2.9375,-2.759764 2.9375,-4.875 0,-3.0393951 -2.460605,-5.5 -5.5,-5.5 z M 7.96875,3 c -2.7702816,0 -5,2.2609684 -5,5.03125 0,1.6448547 0.8081044,3.085265 2.03125,4 L 5,13 3.1875,13 C 1.9761576,13 1,14.022644 1,15.25 L 1,19 4,19 4,16.96875 C 4,15.987008 4.3043716,15.002821 4.96875,14.25 5.6331284,13.497179 6.6678229,13 7.9375,13 L 10,13 10,12.96875 C 8.210112,11.808809 7.03125,9.8033464 7.03125,7.5 c 0,-1.715819 0.6732417,-3.2649803 1.75,-4.4375 C 8.512537,3.0177954 8.2497738,3 7.96875,3 z M 13,4 l 1,0 0,3 3,0 0,0.96875 -3,0 0,3.03125 -1,0 0,-3.03125 -3,0 L 10,7 13,7 13,4 z"
+  fill="GrayText"/>
+</svg>
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/addrbook/button-newlist-hover.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="m 13.53125,1.96875 c -3.039395,0 -5.5,2.4606049 -5.5,5.5 0,2.125635 1.2054528,3.959242 2.96875,4.875 L 11,14 7.75,14 C 6.2413957,14 5.03125,15.252702 5.03125,16.78125 L 5.03125,21 22,21 22,16.78125 C 22,15.252702 20.789763,14.015254 19.28125,14 l -3.1875,0 0,-1.65625 c 1.749204,-0.920287 2.9375,-2.759764 2.9375,-4.875 0,-3.0393951 -2.460605,-5.5 -5.5,-5.5 z M 7.96875,3 c -2.7702816,0 -5,2.2609684 -5,5.03125 0,1.6448547 0.8081044,3.085265 2.03125,4 L 5,13 3.1875,13 C 1.9761576,13 1,14.022644 1,15.25 L 1,19 4,19 4,16.96875 C 4,15.987008 4.3043716,15.002821 4.96875,14.25 5.6331284,13.497179 6.6678229,13 7.9375,13 L 10,13 10,12.96875 C 8.210112,11.808809 7.03125,9.8033464 7.03125,7.5 c 0,-1.715819 0.6732417,-3.2649803 1.75,-4.4375 C 8.512537,3.0177954 8.2497738,3 7.96875,3 z M 13,4 l 1,0 0,3 3,0 0,0.96875 -3,0 0,3.03125 -1,0 0,-3.03125 -3,0 L 10,7 13,7 13,4 z"
+  fill="ButtonText"/>
+</svg>
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/addrbook/button-newlist-small-disabled.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+  <path
+     d="M 9.46875 2.03125 C 7.5357534 2.03125 5.96875 3.5982534 5.96875 5.53125 C 5.96875 6.4977483 6.3666246 7.3666246 7 8 L 7 9 L 5.96875 9 C 4.87074 9 4.0057113 9.8920147 4 11 L 4 14.0625 L 15 14.0625 L 15 11 C 15 9.892 14.12925 9 13.03125 9 L 12 9 L 12 7.9375 C 12.598035 7.3095645 12.96875 6.4668602 12.96875 5.53125 C 12.96875 3.5982534 11.401747 2.03125 9.46875 2.03125 z M 9 3.03125 L 10 3.03125 L 10 5.03125 L 12 5.03125 L 12 6.03125 L 10 6.03125 L 10 8.03125 L 9 8.03125 L 9 6.03125 L 7 6.03125 L 7 5.03125 L 9 5.03125 L 9 3.03125 z M 4.46875 4 C 3.0966676 4 2 5.1149734 2 6.5 C 2 7.3188118 2.3986453 8.0423046 3 8.5 L 3 9.03125 L 1.96875 9.03125 C 0.87074 9.03125 -0.00807677 9.923279 0 11.03125 L 0 13 L 2.96875 13 L 2.96875 11.0625 C 2.96875 10.373169 3.2772784 9.6452582 3.78125 9.0625 C 4.2534923 8.5164313 4.931883 8.1142502 5.71875 8.0625 C 5.231082 7.3429728 4.9375 6.4952892 4.9375 5.5625 C 4.9375 5.0559159 5.0318719 4.583332 5.1875 4.125 C 4.9575053 4.0550527 4.720678 4 4.46875 4 z "
+  fill="GrayText"/>
+</svg>
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/addrbook/button-newlist-small-hover.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+  <path
+     d="M 9.46875 2.03125 C 7.5357534 2.03125 5.96875 3.5982534 5.96875 5.53125 C 5.96875 6.4977483 6.3666246 7.3666246 7 8 L 7 9 L 5.96875 9 C 4.87074 9 4.0057113 9.8920147 4 11 L 4 14.0625 L 15 14.0625 L 15 11 C 15 9.892 14.12925 9 13.03125 9 L 12 9 L 12 7.9375 C 12.598035 7.3095645 12.96875 6.4668602 12.96875 5.53125 C 12.96875 3.5982534 11.401747 2.03125 9.46875 2.03125 z M 9 3.03125 L 10 3.03125 L 10 5.03125 L 12 5.03125 L 12 6.03125 L 10 6.03125 L 10 8.03125 L 9 8.03125 L 9 6.03125 L 7 6.03125 L 7 5.03125 L 9 5.03125 L 9 3.03125 z M 4.46875 4 C 3.0966676 4 2 5.1149734 2 6.5 C 2 7.3188118 2.3986453 8.0423046 3 8.5 L 3 9.03125 L 1.96875 9.03125 C 0.87074 9.03125 -0.00807677 9.923279 0 11.03125 L 0 13 L 2.96875 13 L 2.96875 11.0625 C 2.96875 10.373169 3.2772784 9.6452582 3.78125 9.0625 C 4.2534923 8.5164313 4.931883 8.1142502 5.71875 8.0625 C 5.231082 7.3429728 4.9375 6.4952892 4.9375 5.5625 C 4.9375 5.0559159 5.0318719 4.583332 5.1875 4.125 C 4.9575053 4.0550527 4.720678 4 4.46875 4 z "
+  fill="ButtonText"/>
+</svg>
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/addrbook/button-newlist-small.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="16"
+   height="16">
+  <path
+     d="M 9.46875 2.03125 C 7.5357534 2.03125 5.96875 3.5982534 5.96875 5.53125 C 5.96875 6.4977483 6.3666246 7.3666246 7 8 L 7 9 L 5.96875 9 C 4.87074 9 4.0057113 9.8920147 4 11 L 4 14.0625 L 15 14.0625 L 15 11 C 15 9.892 14.12925 9 13.03125 9 L 12 9 L 12 7.9375 C 12.598035 7.3095645 12.96875 6.4668602 12.96875 5.53125 C 12.96875 3.5982534 11.401747 2.03125 9.46875 2.03125 z M 9 3.03125 L 10 3.03125 L 10 5.03125 L 12 5.03125 L 12 6.03125 L 10 6.03125 L 10 8.03125 L 9 8.03125 L 9 6.03125 L 7 6.03125 L 7 5.03125 L 9 5.03125 L 9 3.03125 z M 4.46875 4 C 3.0966676 4 2 5.1149734 2 6.5 C 2 7.3188118 2.3986453 8.0423046 3 8.5 L 3 9.03125 L 1.96875 9.03125 C 0.87074 9.03125 -0.00807677 9.923279 0 11.03125 L 0 13 L 2.96875 13 L 2.96875 11.0625 C 2.96875 10.373169 3.2772784 9.6452582 3.78125 9.0625 C 4.2534923 8.5164313 4.931883 8.1142502 5.71875 8.0625 C 5.231082 7.3429728 4.9375 6.4952892 4.9375 5.5625 C 4.9375 5.0559159 5.0318719 4.583332 5.1875 4.125 C 4.9575053 4.0550527 4.720678 4 4.46875 4 z "
+  fill="MenuText"/>
+</svg>
--- /dev/null
+++ b/mail/themes/gnomestripe/mail/addrbook/button-newlist.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24">
+  <path
+     d="m 13.53125,1.96875 c -3.039395,0 -5.5,2.4606049 -5.5,5.5 0,2.125635 1.2054528,3.959242 2.96875,4.875 L 11,14 7.75,14 C 6.2413957,14 5.03125,15.252702 5.03125,16.78125 L 5.03125,21 22,21 22,16.78125 C 22,15.252702 20.789763,14.015254 19.28125,14 l -3.1875,0 0,-1.65625 c 1.749204,-0.920287 2.9375,-2.759764 2.9375,-4.875 0,-3.0393951 -2.460605,-5.5 -5.5,-5.5 z M 7.96875,3 c -2.7702816,0 -5,2.2609684 -5,5.03125 0,1.6448547 0.8081044,3.085265 2.03125,4 L 5,13 3.1875,13 C 1.9761576,13 1,14.022644 1,15.25 L 1,19 4,19 4,16.96875 C 4,15.987008 4.3043716,15.002821 4.96875,14.25 5.6331284,13.497179 6.6678229,13 7.9375,13 L 10,13 10,12.96875 C 8.210112,11.808809 7.03125,9.8033464 7.03125,7.5 c 0,-1.715819 0.6732417,-3.2649803 1.75,-4.4375 C 8.512537,3.0177954 8.2497738,3 7.96875,3 z M 13,4 l 1,0 0,3 3,0 0,0.96875 -3,0 0,3.03125 -1,0 0,-3.03125 -3,0 L 10,7 13,7 13,4 z"
+  fill="MenuText"/>
+</svg>
--- a/mail/themes/gnomestripe/mail/messenger.css
+++ b/mail/themes/gnomestripe/mail/messenger.css
@@ -158,8 +158,8 @@ menuitem:not([type]) {
 }
 
 #menu_newCard {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(44px 22px 66px 0px); /* contact-add.png */
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-newcard.svg") !important;
+  -moz-image-region: auto !important;
 }
 
 #openMessageFileMenuitem {
--- a/mail/themes/gnomestripe/mail/compose/messengercompose.css
+++ b/mail/themes/gnomestripe/mail/compose/messengercompose.css
@@ -665,13 +665,13 @@ toolbarbutton.formatting-button {
 
 /** Stock icons for the menu items. */
 #menu_NewMessage {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(176px 22px 198px 0px); /* message-compose.png */
+  list-style-image: url("chrome://messenger/skin/icons/button-newmsg-small.svg") !important;
+  -moz-image-region: auto !important;
 }
 
 #menu_NewContact {
-  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-  -moz-image-region: rect(44px 22px 66px 0px); /* contact-add.png */
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/button-newcard-small.svg") !important;
+  -moz-image-region: auto !important;
 }
 
 #menu_SaveCmd {