diff --git a/browser/themes/linux/Toolbar-inverted.png b/browser/themes/linux/Toolbar-inverted.png
index d63ac8cf69ea..0ffa8f286b85 100644
Binary files a/browser/themes/linux/Toolbar-inverted.png and b/browser/themes/linux/Toolbar-inverted.png differ
diff --git a/browser/themes/linux/Toolbar.png b/browser/themes/linux/Toolbar.png
index c05a0a5ff759..dce0b0a7d994 100644
Binary files a/browser/themes/linux/Toolbar.png and b/browser/themes/linux/Toolbar.png differ
diff --git a/browser/themes/linux/menuPanel.png b/browser/themes/linux/menuPanel.png
index 59061ec0aaa3..5821f40bd938 100644
Binary files a/browser/themes/linux/menuPanel.png and b/browser/themes/linux/menuPanel.png differ
diff --git a/browser/themes/osx/Toolbar-inverted.png b/browser/themes/osx/Toolbar-inverted.png
index 332c09c8884c..ae37cddeba3d 100644
Binary files a/browser/themes/osx/Toolbar-inverted.png and b/browser/themes/osx/Toolbar-inverted.png differ
diff --git a/browser/themes/osx/Toolbar-inverted@2x.png b/browser/themes/osx/Toolbar-inverted@2x.png
index 865dc21c9f7c..14329b60663e 100644
Binary files a/browser/themes/osx/Toolbar-inverted@2x.png and b/browser/themes/osx/Toolbar-inverted@2x.png differ
diff --git a/browser/themes/osx/Toolbar.png b/browser/themes/osx/Toolbar.png
index 159d7a20aff4..522f0b230337 100644
Binary files a/browser/themes/osx/Toolbar.png and b/browser/themes/osx/Toolbar.png differ
diff --git a/browser/themes/osx/Toolbar@2x.png b/browser/themes/osx/Toolbar@2x.png
index 71981cf88cb6..4d0d07880826 100644
Binary files a/browser/themes/osx/Toolbar@2x.png and b/browser/themes/osx/Toolbar@2x.png differ
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 236560fec023..95ca147d9d57 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -761,11 +761,11 @@ toolbar .toolbarbutton-1:not([type="menu-button"]),
   }
 
   #email-link-button[cui-areatype="toolbar"] {
-    -moz-image-region: rect(0, 612px, 36px, 576px);
+    -moz-image-region: rect(0, 1332px, 36px, 1296px);
   }
 
   #email-link-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
-    -moz-image-region: rect(36px, 612px, 72px, 576px);
+    -moz-image-region: rect(36px, 1368px, 72px, 1332px);
   }
 
   #characterencoding-button[cui-areatype="toolbar"] {
@@ -1054,12 +1054,7 @@ toolbar .toolbarbutton-1:not([type="menu-button"]),
 
   #email-link-button[cui-areatype="menu-panel"],
   toolbarpaletteitem[place="palette"] > #email-link-button {
-    -moz-image-region: rect(0px, 896px, 64px, 832px);
-  }
-
-  /* This is temporary until we have an email-link icon (Bug 932235) */
-  #email-link-button > image {
-    transform: scale(-1, -1);
+    -moz-image-region: rect(0px, 1600px, 64px, 1536px);
   }
 
   /* Footer and wide panel control icons */
diff --git a/browser/themes/osx/menuPanel.png b/browser/themes/osx/menuPanel.png
index 4af2c8e2dac3..30111cb8493a 100644
Binary files a/browser/themes/osx/menuPanel.png and b/browser/themes/osx/menuPanel.png differ
diff --git a/browser/themes/osx/menuPanel@2x.png b/browser/themes/osx/menuPanel@2x.png
index 764048a29bde..684a1afd1598 100644
Binary files a/browser/themes/osx/menuPanel@2x.png and b/browser/themes/osx/menuPanel@2x.png differ
diff --git a/browser/themes/shared/menupanel.inc.css b/browser/themes/shared/menupanel.inc.css
index 8ae453053d75..9853c0ab0408 100644
--- a/browser/themes/shared/menupanel.inc.css
+++ b/browser/themes/shared/menupanel.inc.css
@@ -64,10 +64,9 @@ toolbarpaletteitem[place="palette"] > #email-link-button {
   -moz-image-region: rect(0, 448px, 32px, 416px);
 }
 
-/* This is temporary until we have an email-link icon (Bug 932235) */
 #email-link-button[cui-areatype="menu-panel"] > image,
 toolbarpaletteitem[place="palette"] > #email-link-button > image {
-  transform: scale(-1, -1);
+  -moz-image-region: rect(0, 800px, 32px, 768px);
 }
 
 #characterencoding-button[cui-areatype="menu-panel"],
diff --git a/browser/themes/shared/toolbarbuttons.inc.css b/browser/themes/shared/toolbarbuttons.inc.css
index a038a98b8dea..73c3e633ce76 100644
--- a/browser/themes/shared/toolbarbuttons.inc.css
+++ b/browser/themes/shared/toolbarbuttons.inc.css
@@ -65,9 +65,7 @@
 }
 
 #email-link-button[cui-areatype="toolbar"] {
-  -moz-image-region: rect(0, 306px, 18px, 288px);
-  /* This is temporary until we have an email-link icon (Bug 932235) */
-  transform: scale(-1, -1);
+  -moz-image-region: rect(0, 666px, 18px, 648px);
 }
 
 #characterencoding-button[cui-areatype="toolbar"]{
diff --git a/browser/themes/windows/Toolbar-aero.png b/browser/themes/windows/Toolbar-aero.png
index d5b00482d8cb..52fc5535bcea 100644
Binary files a/browser/themes/windows/Toolbar-aero.png and b/browser/themes/windows/Toolbar-aero.png differ
diff --git a/browser/themes/windows/Toolbar-inverted.png b/browser/themes/windows/Toolbar-inverted.png
index d63ac8cf69ea..0ffa8f286b85 100644
Binary files a/browser/themes/windows/Toolbar-inverted.png and b/browser/themes/windows/Toolbar-inverted.png differ
diff --git a/browser/themes/windows/Toolbar-lunaSilver.png b/browser/themes/windows/Toolbar-lunaSilver.png
index 320c4cd12728..41cd28940050 100644
Binary files a/browser/themes/windows/Toolbar-lunaSilver.png and b/browser/themes/windows/Toolbar-lunaSilver.png differ
diff --git a/browser/themes/windows/Toolbar.png b/browser/themes/windows/Toolbar.png
index c05a0a5ff759..dce0b0a7d994 100644
Binary files a/browser/themes/windows/Toolbar.png and b/browser/themes/windows/Toolbar.png differ
diff --git a/browser/themes/windows/menuPanel-aero.png b/browser/themes/windows/menuPanel-aero.png
index 59061ec0aaa3..eeeca15ac80e 100644
Binary files a/browser/themes/windows/menuPanel-aero.png and b/browser/themes/windows/menuPanel-aero.png differ
diff --git a/browser/themes/windows/menuPanel.png b/browser/themes/windows/menuPanel.png
index 31d8d282579e..5821f40bd938 100644
Binary files a/browser/themes/windows/menuPanel.png and b/browser/themes/windows/menuPanel.png differ