12 files changed, 68 insertions, 96 deletions
diff --git a/toolkit/themes/windows/global/findBar.css b/toolkit/themes/windows/global/findBar.css
index 96115f193..34b3ae49b 100644
--- a/toolkit/themes/windows/global/findBar.css
+++ b/toolkit/themes/windows/global/findBar.css
@@ -4,8 +4,18 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
+.findbar-closebutton {
+  border: none;
+  padding: 3px 5px;
+  -moz-appearance: none;
+}
+
+.findbar-closebutton:-moz-lwtheme-brighttext {
+  list-style-image: url("chrome://global/skin/icons/close-inverted.png");
+}
+
 findbar {
-  box-shadow: 0 1px 1px rgba(0,0,0,.1) inset;
+  padding-top: 1px;
   background-image: linear-gradient(rgba(0,0,0,.15) 1px, rgba(255,255,255,.15) 1px);
   background-size: 100% 2px;
   background-repeat: no-repeat;
@@ -24,137 +34,94 @@ findbar[hidden] {
   transition-delay: 0s, 0s, 150ms;
 }
 
-findbar[noanim] {
-  transition-duration: 0s !important;
-  transition-delay: 0s !important;
-}
+/* find-next button */
 
-.findbar-container {
-  padding-inline-start: 8px;
-  padding-top: 4px;
-  padding-bottom: 4px;
+.findbar-find-next {
+  list-style-image: url("chrome://global/skin/icons/find.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
 }
 
-.findbar-closebutton {
-  margin-inline-start: 4px;
-  padding-inline-start: 0;
-  padding-inline-end: 8px;
-  border: none;
-  -moz-appearance: none;
+.findbar-find-next:hover {
+  -moz-image-region: rect(16px 16px 32px 0px);
 }
 
-
-/* Search field */
-
-.findbar-textbox {
-  -moz-appearance: none;
-  border: 1px solid ThreeDShadow;
-  border-radius: 2px 0 0 2px;
-  margin: 0;
-  padding: 1px 5px;
-  width: 14em;
+.findbar-find-next[disabled="true"] {
+  -moz-image-region: rect(32px 16px 48px 0px) !important;
 }
 
-.findbar-textbox:-moz-locale-dir(rtl) {
-  border-radius: 0 2px 2px 0;
-}
+/* find-previous button */
 
-.findbar-textbox[focused="true"] {
-  border-color: Highlight;
+.findbar-find-previous {
+  list-style-image: url("chrome://global/skin/icons/find.png");
+  -moz-image-region: rect(0px 32px 16px 16px);
 }
 
-.findbar-textbox[status="notfound"] {
-  background-color: #f66;
-  color: white;
+.findbar-find-previous:hover {
+  -moz-image-region: rect(16px 32px 32px 16px);
 }
 
-.findbar-textbox[flash="true"] {
-  background-color: yellow;
-  color: black;
+.findbar-find-previous[disabled="true"] {
+  -moz-image-region: rect(32px 32px 48px 16px) !important;
 }
 
-.findbar-textbox.minimal {
-  border-radius: 2px;
-}
-
-/* Buttons */
-
-.findbar-find-previous,
-.findbar-find-next {
-  margin-inline-start: 0;
-  -moz-appearance: none;
-  background: linear-gradient(rgba(255,255,255,.8) 1px, rgba(255,255,255,.4) 1px, rgba(255,255,255,.1));
-  border: 1px solid ThreeDShadow;
-  padding: 1px 5px;
-  line-height: 1em;
-}
+/* highlight button */
 
-.findbar-find-previous:not([disabled]):active,
-.findbar-find-next:not([disabled]):active {
-  background: rgba(23,50,76,.2);
-  box-shadow: 0 1px 2px rgba(10,31,51,.2) inset;
+.findbar-highlight {
+  list-style-image: url("chrome://global/skin/icons/find.png");
+  -moz-image-region: rect(0px 48px 16px 32px);
 }
 
-.findbar-find-previous {
-  list-style-image: url(chrome://global/skin/icons/find-arrows.svg#glyph-find-previous);
+.findbar-highlight:hover {
+  -moz-image-region: rect(16px 48px 32px 32px);
 }
 
-.findbar-find-next {
-  list-style-image: url(chrome://global/skin/icons/find-arrows.svg#glyph-find-next);
+.findbar-highlight[disabled="true"] {
+  -moz-image-region: rect(32px 48px 48px 32px) !important;
 }
 
-.findbar-find-previous,
-.findbar-find-previous:not([disabled]):active {
-  border-right: none;
-  border-left: none;
+.findbar-highlight:active, .findbar-highlight[checked="true"] {
+  -moz-image-region: rect(48px 48px 64px 32px);
 }
 
-.findbar-find-previous > .toolbarbutton-icon,
-.findbar-find-next > .toolbarbutton-icon {
-  margin: 0;
+.findbar-highlight[checked="true"]:hover {
+  -moz-image-region: rect(64px 48px 80px 32px);
 }
 
-.findbar-find-previous[disabled="true"] > .toolbarbutton-icon,
-.findbar-find-next[disabled="true"] > .toolbarbutton-icon {
-  opacity: .5;
+.find-status-icon {
+  list-style-image: none;
+  margin-top: 2px;
+  margin-bottom: 0px;
+  -moz-margin-start: 12px;
+  -moz-margin-end: 0px;
+  width: 16px;
+  height: 16px;
 }
 
-.findbar-find-next:-moz-locale-dir(ltr) {
-  border-top-right-radius: 2px;
-  border-bottom-right-radius: 2px;
+.findbar-find-status,
+.found-matches {
+  margin: 0 !important;
+  -moz-margin-start: 3px !important;
+  padding: 2px !important;
 }
 
-.findbar-find-next:-moz-locale-dir(rtl) {
-  border-top-left-radius: 2px;
-  border-bottom-left-radius: 2px;
+.find-status-icon[status="notfound"] {
+  list-style-image: url("chrome://global/skin/icons/information-16.png");
 }
 
-.findbar-highlight,
-.findbar-case-sensitive,
-.findbar-entire-word {
-  margin-inline-start: 5px;
+.findbar-textbox[status="notfound"] {
+  box-shadow: 0 0 0 1em #f66 inset;
+  color: white;
 }
 
-.findbar-highlight > .toolbarbutton-icon,
-.findbar-case-sensitive > .toolbarbutton-icon,
-.findbar-entire-word > .toolbarbutton-icon {
-  display: none;
+.findbar-textbox[flash="true"] {
+  box-shadow: 0 0 0 1em yellow inset;
+  color: black;
 }
 
-.findbar-find-status,
-.found-matches {
-  color: GrayText;
-  margin: 0 !important;
-  margin-inline-start: 12px !important;
+.find-status-icon[status="wrapped"] {
+  list-style-image: url("chrome://global/skin/icons/wrap.png");
 }
 
 .find-status-icon[status="pending"] {
-  list-style-image: url("chrome://global/skin/icons/loading.png");
-}
-
-@media (min-resolution: 1.1dppx) {
-  .find-status-icon[status="pending"] {
-    width: 16px;
-    list-style-image: url("chrome://global/skin/icons/loading@2x.png");
-  }
+  list-style-image: url("chrome://global/skin/icons/loading_16.png");
 }
diff --git a/toolkit/themes/windows/global/icons/find.png b/toolkit/themes/windows/global/icons/find.png
new file mode 100644
index 000000000..60d6da97e
--- /dev/null
+++ b/toolkit/themes/windows/global/icons/find.png
diff --git a/toolkit/themes/windows/global/icons/question-32.png b/toolkit/themes/windows/global/icons/question-32.png
new file mode 100644
index 000000000..7c80831b0
--- /dev/null
+++ b/toolkit/themes/windows/global/icons/question-32.png
diff --git a/toolkit/themes/windows/global/icons/question-48.png b/toolkit/themes/windows/global/icons/question-48.png
new file mode 100644
index 000000000..dd2b21874
--- /dev/null
+++ b/toolkit/themes/windows/global/icons/question-48.png
diff --git a/toolkit/themes/windows/global/jar.mn b/toolkit/themes/windows/global/jar.mn
index 7f2f29942..a6ccbd71d 100644
--- a/toolkit/themes/windows/global/jar.mn
+++ b/toolkit/themes/windows/global/jar.mn
@@ -48,6 +48,7 @@ toolkit.jar:
   skin/classic/global/icons/close-win7@2x.png              (icons/close-win7@2x.png)
   skin/classic/global/icons/close-inverted-win7.png        (icons/close-inverted-win7.png)
   skin/classic/global/icons/close-inverted-win7@2x.png     (icons/close-inverted-win7@2x.png)
+  skin/classic/global/icons/find.png                       (icons/find.png)
   skin/classic/global/icons/resizer.png                    (icons/resizer.png)
   skin/classic/global/icons/sslWarning.png                 (icons/sslWarning.png)
 * skin/classic/global/in-content/common.css                (in-content/common.css)
diff --git a/toolkit/themes/windows/mozapps/jar.mn b/toolkit/themes/windows/mozapps/jar.mn
index 29203811f..0d77a4e79 100644
--- a/toolkit/themes/windows/mozapps/jar.mn
+++ b/toolkit/themes/windows/mozapps/jar.mn
@@ -68,9 +68,13 @@ toolkit.jar:
 * skin/classic/mozapps/xpinstall/xpinstallConfirm.css        (extensions/xpinstallConfirm.css)
   skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png    (extensions/extensionGeneric.png)
 #endif
+  skin/classic/mozapps/passwordmgr/key.png                   (passwordmgr/key.png)
+  skin/classic/mozapps/passwordmgr/key-16.png                (passwordmgr/key-16.png)
+  skin/classic/mozapps/passwordmgr/key-64.png                (passwordmgr/key-64.png)
   skin/classic/mozapps/plugins/pluginGeneric.png             (plugins/pluginGeneric.png)
   skin/classic/mozapps/plugins/pluginBlocked.png             (plugins/pluginBlocked.png)
   skin/classic/mozapps/plugins/pluginGeneric-16.png          (plugins/pluginGeneric-16.png)
+  skin/classic/mozapps/plugins/pluginGeneric-48.png          (plugins/pluginGeneric-48.png)
   skin/classic/mozapps/profile/profileicon.png               (profile/profileicon.png)
   skin/classic/mozapps/update/updates.css                    (update/updates.css)
   skin/classic/mozapps/viewsource/viewsource.css             (viewsource/viewsource.css)
diff --git a/toolkit/themes/windows/mozapps/passwordmgr/key-16.png b/toolkit/themes/windows/mozapps/passwordmgr/key-16.png
new file mode 100644
index 000000000..ac135b847
--- /dev/null
+++ b/toolkit/themes/windows/mozapps/passwordmgr/key-16.png
diff --git a/toolkit/themes/windows/mozapps/passwordmgr/key-64.png b/toolkit/themes/windows/mozapps/passwordmgr/key-64.png
new file mode 100644
index 000000000..0fb69f382
--- /dev/null
+++ b/toolkit/themes/windows/mozapps/passwordmgr/key-64.png
diff --git a/toolkit/themes/windows/mozapps/passwordmgr/key.png b/toolkit/themes/windows/mozapps/passwordmgr/key.png
new file mode 100644
index 000000000..b5e8afefc
--- /dev/null
+++ b/toolkit/themes/windows/mozapps/passwordmgr/key.png
diff --git a/toolkit/themes/windows/mozapps/plugins/pluginGeneric-16.png b/toolkit/themes/windows/mozapps/plugins/pluginGeneric-16.png
index 5d796cc4c..080b0e502 100644
--- a/toolkit/themes/windows/mozapps/plugins/pluginGeneric-16.png
+++ b/toolkit/themes/windows/mozapps/plugins/pluginGeneric-16.png
diff --git a/toolkit/themes/windows/mozapps/plugins/pluginGeneric-48.png b/toolkit/themes/windows/mozapps/plugins/pluginGeneric-48.png
new file mode 100644
index 000000000..173679448
--- /dev/null
+++ b/toolkit/themes/windows/mozapps/plugins/pluginGeneric-48.png
diff --git a/toolkit/themes/windows/mozapps/plugins/pluginGeneric.png b/toolkit/themes/windows/mozapps/plugins/pluginGeneric.png
index d8b270ae5..1fcbf154e 100644
--- a/toolkit/themes/windows/mozapps/plugins/pluginGeneric.png
+++ b/toolkit/themes/windows/mozapps/plugins/pluginGeneric.png