--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -34,16 +34,19 @@ browser.jar:
 * skin/classic/browser/customizableui/panelUI.css (customizableui/panelUI.css)
 * skin/classic/browser/downloads/allDownloadsViewOverlay.css   (downloads/allDownloadsViewOverlay.css)
   skin/classic/browser/downloads/download-glow-menuPanel.png (downloads/download-glow-menuPanel.png)
 * skin/classic/browser/downloads/downloads.css        (downloads/downloads.css)
   skin/classic/browser/feeds/feedIcon.png             (feeds/feedIcon.png)
   skin/classic/browser/feeds/feedIcon16.png           (feeds/feedIcon16.png)
   skin/classic/browser/feeds/subscribe.css            (feeds/subscribe.css)
 * skin/classic/browser/newtab/newTab.css              (newtab/newTab.css)
+* skin/classic/browser/notification-icons/geo-blocked.svg  (notification-icons/geo-blocked.svg)
+  skin/classic/browser/notification-icons/geo-detailed.svg (notification-icons/geo-detailed.svg)
+* skin/classic/browser/notification-icons/geo.svg          (notification-icons/geo.svg)
   skin/classic/browser/places/allBookmarks.png        (places/allBookmarks.png)
   skin/classic/browser/places/bookmarksMenu.png       (places/bookmarksMenu.png)
   skin/classic/browser/places/bookmarksToolbar.png    (places/bookmarksToolbar.png)
   skin/classic/browser/places/bookmarksToolbar-menuPanel.png (places/bookmarksToolbar-menuPanel.png)
   skin/classic/browser/places/bookmarks-menu-arrow.png           (places/bookmarks-menu-arrow.png)
   skin/classic/browser/places/calendar.png            (places/calendar.png)
 * skin/classic/browser/places/editBookmarkOverlay.css (places/editBookmarkOverlay.css)
   skin/classic/browser/places/livemark-item.png       (places/livemark-item.png)

rename from browser/themes/shared/notification-icons/geo-linux-blocked.svg
rename to browser/themes/linux/notification-icons/geo-blocked.svg
--- a/browser/themes/shared/notification-icons/geo-linux-blocked.svg
+++ b/browser/themes/linux/notification-icons/geo-blocked.svg
@@ -1,12 +1,12 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg"
      width="32" height="32" viewBox="0 0 32 32">
   <defs>
-#include clip-path.inc.svg
-#include geo-linux-icon.inc.svg
+#include ../../shared/notification-icons/clip-path.inc.svg
+#include geo-icon.inc.svg
   </defs>
   <use clip-path="url(#blocked-clipPath)" href="#geo-linux-icon"/>
-#include strikeout.inc.svg
+#include ../../shared/notification-icons/strikeout.inc.svg
 </svg>

rename from browser/themes/shared/notification-icons/geo-linux-detailed.svg
rename to browser/themes/linux/notification-icons/geo-detailed.svg

rename from browser/themes/shared/notification-icons/geo-linux-icon.inc.svg
rename to browser/themes/linux/notification-icons/geo-icon.inc.svg

rename from browser/themes/shared/notification-icons/geo-linux.svg
rename to browser/themes/linux/notification-icons/geo.svg
--- a/browser/themes/shared/notification-icons/geo-linux.svg
+++ b/browser/themes/linux/notification-icons/geo.svg
@@ -1,7 +1,7 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg"
      width="32" height="32" viewBox="0 0 32 32">
-#include geo-linux-icon.inc.svg
+#include geo-icon.inc.svg
 </svg>

--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -55,16 +55,18 @@ browser.jar:
 * skin/classic/browser/downloads/downloads.css              (downloads/downloads.css)
   skin/classic/browser/feeds/subscribe.css                  (feeds/subscribe.css)
   skin/classic/browser/feeds/feedIcon.png                   (feeds/feedIcon.png)
   skin/classic/browser/feeds/feedIcon16.png                 (feeds/feedIcon16.png)
 * skin/classic/browser/newtab/newTab.css                    (newtab/newTab.css)
   skin/classic/browser/setDesktopBackground.css
   skin/classic/browser/monitor.png
   skin/classic/browser/monitor_16-10.png
+* skin/classic/browser/notification-icons/geo-blocked.svg  (notification-icons/geo-blocked.svg)
+* skin/classic/browser/notification-icons/geo.svg          (notification-icons/geo.svg)
   skin/classic/browser/places/allBookmarks.png              (places/allBookmarks.png)
 * skin/classic/browser/places/places.css                    (places/places.css)
   skin/classic/browser/places/organizer.css                 (places/organizer.css)
   skin/classic/browser/places/query.png                     (places/query.png)
   skin/classic/browser/places/query@2x.png                  (places/query@2x.png)
   skin/classic/browser/places/bookmarksMenu.png             (places/bookmarksMenu.png)
   skin/classic/browser/places/bookmarksToolbar.png          (places/bookmarksToolbar.png)
   skin/classic/browser/places/bookmarksToolbar@2x.png       (places/bookmarksToolbar@2x.png)
@@ -109,16 +111,18 @@ browser.jar:
   skin/classic/browser/e10s-64@2x.png (../shared/e10s-64@2x.png)
 #endif
 
 [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 % override chrome://browser/skin/feeds/audioFeedIcon.png                   chrome://browser/skin/feeds/feedIcon.png
 % override chrome://browser/skin/feeds/audioFeedIcon16.png                 chrome://browser/skin/feeds/feedIcon16.png
 % override chrome://browser/skin/feeds/videoFeedIcon.png                   chrome://browser/skin/feeds/feedIcon.png
 % override chrome://browser/skin/feeds/videoFeedIcon16.png                 chrome://browser/skin/feeds/feedIcon16.png
+% override chrome://browser/skin/notification-icons/geo-detailed.svg       chrome://browser/skin/notification-icons/geo.svg
+
 % override chrome://browser/skin/menuPanel-customize.png                   chrome://browser/skin/yosemite/menuPanel-customize.png                  os=Darwin osversion>=10.10
 % override chrome://browser/skin/menuPanel-customize@2x.png                chrome://browser/skin/yosemite/menuPanel-customize@2x.png               os=Darwin osversion>=10.10
 % override chrome://browser/skin/menuPanel-exit.png                        chrome://browser/skin/yosemite/menuPanel-exit.png                       os=Darwin osversion>=10.10
 % override chrome://browser/skin/menuPanel-exit@2x.png                     chrome://browser/skin/yosemite/menuPanel-exit@2x.png                    os=Darwin osversion>=10.10
 % override chrome://browser/skin/menuPanel-help.png                        chrome://browser/skin/yosemite/menuPanel-help.png                       os=Darwin osversion>=10.10
 % override chrome://browser/skin/menuPanel-help@2x.png                     chrome://browser/skin/yosemite/menuPanel-help@2x.png                    os=Darwin osversion>=10.10
 % override chrome://browser/skin/reload-stop-go.png                        chrome://browser/skin/yosemite/reload-stop-go.png                       os=Darwin osversion>=10.10
 % override chrome://browser/skin/reload-stop-go@2x.png                     chrome://browser/skin/yosemite/reload-stop-go@2x.png                    os=Darwin osversion>=10.10

rename from browser/themes/shared/notification-icons/geo-osx-blocked.svg
rename to browser/themes/osx/notification-icons/geo-blocked.svg
--- a/browser/themes/shared/notification-icons/geo-osx-blocked.svg
+++ b/browser/themes/osx/notification-icons/geo-blocked.svg
@@ -1,12 +1,12 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg"
      width="32" height="32" viewBox="0 0 32 32">
   <defs>
-#include clip-path.inc.svg
-#include geo-osx-icon.inc.svg
+#include ../../shared/notification-icons/clip-path.inc.svg
+#include geo-icon.inc.svg
   </defs>
   <use clip-path="url(#blocked-clipPath)" href="#geo-osx-icon"/>
-#include strikeout.inc.svg
+#include ../../shared/notification-icons/strikeout.inc.svg
 </svg>

rename from browser/themes/shared/notification-icons/geo-osx-icon.inc.svg
rename to browser/themes/osx/notification-icons/geo-icon.inc.svg

rename from browser/themes/shared/notification-icons/geo-osx.svg
rename to browser/themes/osx/notification-icons/geo.svg
--- a/browser/themes/shared/notification-icons/geo-osx.svg
+++ b/browser/themes/osx/notification-icons/geo.svg
@@ -1,7 +1,7 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg"
      width="32" height="32" viewBox="0 0 32 32">
-#include geo-osx-icon.inc.svg
+#include geo-icon.inc.svg
 </svg>

--- a/browser/themes/shared/incontentprefs/privacy.css
+++ b/browser/themes/shared/incontentprefs/privacy.css
@@ -6,23 +6,17 @@
   max-height: 20px;
   max-width: 20px;
   vertical-align: middle;
   -moz-context-properties: fill;
   fill: currentColor;
 }
 
 .geo-icon {
-%ifdef XP_MACOSX
-  list-style-image: url(chrome://browser/skin/notification-icons/geo-osx.svg);
-%elif defined(MOZ_WIDGET_GTK)
-  list-style-image: url(chrome://browser/skin/notification-icons/geo-linux.svg);
-%else
-  list-style-image: url(chrome://browser/skin/notification-icons/geo-windows.svg);
-%endif
+  list-style-image: url(chrome://browser/skin/notification-icons/geo.svg);
 }
 
 .camera-icon {
   list-style-image: url(chrome://browser/skin/notification-icons/camera.svg);
 }
 
 .microphone-icon {
   list-style-image: url(chrome://browser/skin/notification-icons/microphone.svg);

--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -58,28 +58,16 @@
   skin/classic/browser/info.svg                                (../shared/info.svg)
 
 * skin/classic/browser/notification-icons/camera-blocked.svg                (../shared/notification-icons/camera-blocked.svg)
 * skin/classic/browser/notification-icons/camera.svg                        (../shared/notification-icons/camera.svg)
   skin/classic/browser/notification-icons/default-info.svg                  (../shared/notification-icons/default-info.svg)
 * skin/classic/browser/notification-icons/desktop-notification-blocked.svg  (../shared/notification-icons/desktop-notification-blocked.svg)
 * skin/classic/browser/notification-icons/desktop-notification.svg          (../shared/notification-icons/desktop-notification.svg)
   skin/classic/browser/notification-icons/focus-tab-by-prompt.svg           (../shared/notification-icons/focus-tab-by-prompt.svg)
-#ifdef XP_MACOSX
-* skin/classic/browser/notification-icons/geo-osx-blocked.svg               (../shared/notification-icons/geo-osx-blocked.svg)
-* skin/classic/browser/notification-icons/geo-osx.svg                       (../shared/notification-icons/geo-osx.svg)
-#elif MOZ_WIDGET_GTK
-* skin/classic/browser/notification-icons/geo-linux-blocked.svg             (../shared/notification-icons/geo-linux-blocked.svg)
-  skin/classic/browser/notification-icons/geo-linux-detailed.svg            (../shared/notification-icons/geo-linux-detailed.svg)
-* skin/classic/browser/notification-icons/geo-linux.svg                     (../shared/notification-icons/geo-linux.svg)
-#elif XP_WIN
-* skin/classic/browser/notification-icons/geo-windows-blocked.svg           (../shared/notification-icons/geo-windows-blocked.svg)
-  skin/classic/browser/notification-icons/geo-windows-detailed.svg          (../shared/notification-icons/geo-windows-detailed.svg)
-* skin/classic/browser/notification-icons/geo-windows.svg                   (../shared/notification-icons/geo-windows.svg)
-#endif
 * skin/classic/browser/notification-icons/indexedDB-blocked.svg             (../shared/notification-icons/indexedDB-blocked.svg)
 * skin/classic/browser/notification-icons/indexedDB.svg                     (../shared/notification-icons/indexedDB.svg)
   skin/classic/browser/notification-icons/login-detailed.svg                (../shared/notification-icons/login-detailed.svg)
   skin/classic/browser/notification-icons/login.svg                         (../shared/notification-icons/login.svg)
 * skin/classic/browser/notification-icons/microphone-blocked.svg            (../shared/notification-icons/microphone-blocked.svg)
   skin/classic/browser/notification-icons/microphone-detailed.svg           (../shared/notification-icons/microphone-detailed.svg)
 * skin/classic/browser/notification-icons/microphone.svg                    (../shared/notification-icons/microphone.svg)
 * skin/classic/browser/notification-icons/persistent-storage-blocked.svg    (../shared/notification-icons/persistent-storage-blocked.svg)
@@ -108,17 +96,17 @@
   skin/classic/browser/preferences/in-content-new/face-smile.svg   (../shared/incontentprefs/face-smile.svg)
   skin/classic/browser/preferences/in-content-new/fxa-avatar.svg   (../shared/incontentprefs/fxa-avatar.svg)
   skin/classic/browser/preferences/in-content-new/general.svg      (../shared/incontentprefs/general.svg)
   skin/classic/browser/preferences/in-content-new/help.svg         (../shared/incontentprefs/help.svg)
   skin/classic/browser/preferences/in-content-new/logo-android.svg (../shared/incontentprefs/logo-android.svg)
   skin/classic/browser/preferences/in-content-new/logo-ios.svg     (../shared/incontentprefs/logo-ios.svg)
   skin/classic/browser/preferences/in-content-new/no-search-results.svg       (../shared/incontentprefs/no-search-results.svg)
   skin/classic/browser/preferences/in-content-new/privacy-security.svg        (../shared/incontentprefs/privacy-security.svg)
-* skin/classic/browser/preferences/in-content-new/privacy.css      (../shared/incontentprefs/privacy.css)
+  skin/classic/browser/preferences/in-content-new/privacy.css      (../shared/incontentprefs/privacy.css)
   skin/classic/browser/preferences/in-content-new/search-arrow-indicator.svg  (../shared/incontentprefs/search-arrow-indicator.svg)
   skin/classic/browser/preferences/in-content-new/search.css       (../shared/incontentprefs/search.css)
   skin/classic/browser/preferences/in-content-new/search.svg       (../shared/incontentprefs/search.svg)
   skin/classic/browser/preferences/in-content-new/siteDataSettings.css (../shared/incontentprefs/siteDataSettings.css)
   skin/classic/browser/preferences/in-content-new/sync-devices.svg (../shared/incontentprefs/sync-devices.svg)
   skin/classic/browser/preferences/in-content-new/sync.svg         (../shared/incontentprefs/sync.svg)
 * skin/classic/browser/preferences/in-content-new/containers.css   (../shared/incontentprefs/containers.css)
   skin/classic/browser/preferences/in-content/icons.svg        (../shared/incontentprefs-old/icons.svg)

--- a/browser/themes/shared/notification-icons.inc.css
+++ b/browser/themes/shared/notification-icons.inc.css
@@ -44,43 +44,25 @@
   list-style-image: url(chrome://browser/skin/notification-icons/desktop-notification.svg);
 }
 
 .desktop-notification-icon.blocked-permission-icon {
   list-style-image: url(chrome://browser/skin/notification-icons/desktop-notification-blocked.svg);
 }
 
 .geo-icon {
-%ifdef XP_MACOSX
-  list-style-image: url(chrome://browser/skin/notification-icons/geo-osx.svg);
-%elif defined(MOZ_WIDGET_GTK)
-  list-style-image: url(chrome://browser/skin/notification-icons/geo-linux.svg);
-%else
-  list-style-image: url(chrome://browser/skin/notification-icons/geo-windows.svg);
-%endif
+  list-style-image: url(chrome://browser/skin/notification-icons/geo.svg);
 }
 
 .geo-icon.blocked-permission-icon {
-%ifdef XP_MACOSX
-  list-style-image: url(chrome://browser/skin/notification-icons/geo-osx-blocked.svg);
-%elif defined(MOZ_WIDGET_GTK)
-  list-style-image: url(chrome://browser/skin/notification-icons/geo-linux-blocked.svg);
-%else
-  list-style-image: url(chrome://browser/skin/notification-icons/geo-windows-blocked.svg);
-%endif
+  list-style-image: url(chrome://browser/skin/notification-icons/geo-blocked.svg);
 }
 
 .popup-notification-icon[popupid="geolocation"] {
-%ifdef XP_MACOSX
-  list-style-image: url(chrome://browser/skin/notification-icons/geo-osx.svg);
-%elif defined(MOZ_WIDGET_GTK)
-  list-style-image: url(chrome://browser/skin/notification-icons/geo-linux-detailed.svg);
-%else
-  list-style-image: url(chrome://browser/skin/notification-icons/geo-windows-detailed.svg);
-%endif
+  list-style-image: url(chrome://browser/skin/notification-icons/geo-detailed.svg);
 }
 
 .popup-notification-icon[popupid="indexedDB-permissions-prompt"],
 .indexedDB-icon {
   list-style-image: url(chrome://browser/skin/notification-icons/indexedDB.svg);
 }
 
 .indexedDB-icon.blocked-permission-icon {

--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -47,16 +47,19 @@ browser.jar:
 * skin/classic/browser/downloads/allDownloadsViewOverlay.css   (downloads/allDownloadsViewOverlay.css)
   skin/classic/browser/downloads/download-glow-menuPanel.png   (downloads/download-glow-menuPanel.png)
   skin/classic/browser/downloads/download-glow-menuPanel-win7.png   (downloads/download-glow-menuPanel-win7.png)
 * skin/classic/browser/downloads/downloads.css                 (downloads/downloads.css)
   skin/classic/browser/feeds/feedIcon.png                      (feeds/feedIcon.png)
   skin/classic/browser/feeds/feedIcon16.png                    (feeds/feedIcon16.png)
   skin/classic/browser/feeds/subscribe.css                     (feeds/subscribe.css)
 * skin/classic/browser/newtab/newTab.css                       (newtab/newTab.css)
+* skin/classic/browser/notification-icons/geo-blocked.svg      (notification-icons/geo-blocked.svg)
+  skin/classic/browser/notification-icons/geo-detailed.svg     (notification-icons/geo-detailed.svg)
+* skin/classic/browser/notification-icons/geo.svg              (notification-icons/geo.svg)
 * skin/classic/browser/places/places.css                       (places/places.css)
 * skin/classic/browser/places/organizer.css                    (places/organizer.css)
   skin/classic/browser/places/query.png                        (places/query.png)
   skin/classic/browser/places/bookmarksMenu.png                (places/bookmarksMenu.png)
   skin/classic/browser/places/bookmarksToolbar.png             (places/bookmarksToolbar.png)
   skin/classic/browser/places/bookmarksToolbar-menuPanel.png   (places/bookmarksToolbar-menuPanel.png)
   skin/classic/browser/places/calendar.png                     (places/calendar.png)
   skin/classic/browser/places/toolbarDropMarker.png            (places/toolbarDropMarker.png)

rename from browser/themes/shared/notification-icons/geo-windows-blocked.svg
rename to browser/themes/windows/notification-icons/geo-blocked.svg
--- a/browser/themes/shared/notification-icons/geo-windows-blocked.svg
+++ b/browser/themes/windows/notification-icons/geo-blocked.svg
@@ -1,12 +1,12 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg"
      width="32" height="32" viewBox="0 0 32 32">
   <defs>
-#include clip-path.inc.svg
-#include geo-windows-icon.inc.svg
+#include ../../shared/notification-icons/clip-path.inc.svg
+#include geo-icon.inc.svg
   </defs>
   <use clip-path="url(#blocked-clipPath)" href="#geo-windows-icon"/>
-#include strikeout.inc.svg
+#include ../../shared/notification-icons/strikeout.inc.svg
 </svg>

rename from browser/themes/shared/notification-icons/geo-windows-detailed.svg
rename to browser/themes/windows/notification-icons/geo-detailed.svg

rename from browser/themes/shared/notification-icons/geo-windows-icon.inc.svg
rename to browser/themes/windows/notification-icons/geo-icon.inc.svg

rename from browser/themes/shared/notification-icons/geo-windows.svg
rename to browser/themes/windows/notification-icons/geo.svg
--- a/browser/themes/shared/notification-icons/geo-windows.svg
+++ b/browser/themes/windows/notification-icons/geo.svg
@@ -1,7 +1,7 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg"
      width="32" height="32" viewBox="0 0 32 32">
-#include geo-windows-icon.inc.svg
+#include geo-icon.inc.svg
 </svg>