diff --git a/toolkit/themes/pinstripe/mozapps/jar.mn b/toolkit/themes/pinstripe/mozapps/jar.mn
index f942db1c5519..fa68806809cb 100644
--- a/toolkit/themes/pinstripe/mozapps/jar.mn
+++ b/toolkit/themes/pinstripe/mozapps/jar.mn
@@ -31,7 +31,7 @@ toolkit.jar:
   skin/classic/mozapps/profile/profileicon-selected.png           (profile/profileicon-selected.png)
   skin/classic/mozapps/profile/profileSelection.css               (profile/profileSelection.css)
   skin/classic/mozapps/update/buttons.png                         (update/buttons.png)
-  skin/classic/mozapps/update/updates.css                         (update/updates.css)
+* skin/classic/mozapps/update/updates.css                         (update/updates.css)
   skin/classic/mozapps/viewsource/viewsource.css                  (viewsource/viewsource.css)
   skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png         (xpinstall/xpinstallItemGeneric.png)
   skin/classic/mozapps/xpinstall/xpinstallConfirm.css             (xpinstall/xpinstallConfirm.css)
diff --git a/toolkit/themes/pinstripe/mozapps/update/updates.css b/toolkit/themes/pinstripe/mozapps/update/updates.css
index 52aecc420ad1..51d3287b99f9 100644
--- a/toolkit/themes/pinstripe/mozapps/update/updates.css
+++ b/toolkit/themes/pinstripe/mozapps/update/updates.css
@@ -1,125 +1,118 @@
-/**
- * General
- */
-.heed {
-  font-weight: bold;
+%include ../../global/shared.inc
+
+/* General */
+/* Specify the size for the wizardpage so the billboard has a fixed size. 3rd
+   party themes should typically specify the same values. */
+wizardpage {
+  height: 360px;
+  width: 700px;
 }
 
-link {
-  color: -moz-nativehyperlinktext;
-  border: 1px solid transparent;
-  margin-top: 1px;
-  margin-bottom: 4px;
-  -moz-margin-start: 5px;
-  -moz-margin-end: 5px;
-  text-decoration: underline !important;
+/* Remove margin and padding so the billboard will extend to the edge of the
+   window. 3rd party themes should typically specify the same values. */
+#updates, .wizard-page-box {
+  margin: 0;
+  padding: 0;
 }
 
-link > label {
-  margin: 0px;
-  padding: 1px;
-  text-decoration: underline !important;
+.update-content {
+  padding: 6px 12px 12px 12px;
 }
 
-link:focus {
-  border: 1px dotted -moz-DialogText;
+.wizard-header-box-text {
+  padding: 0;
 }
 
-.wizard-page-box {
-  padding: 15px 10px 15px 10px;
+.wizard-header {
+  margin: 12px 12px 0 12px;
 }
 
-remotecontent {
-  margin-top: 1px;
-  margin-bottom: 4px;
-  -moz-margin-start: 6px;
-  -moz-margin-end: 5px;
-  -moz-appearance: listbox;
-  padding-bottom: 1px;
+.wizard-buttons-btm {
+  padding: 3px 0;
+  margin: 12px;
+}
+
+/* Don't use top margin - it can cause a scrollbar on the incompatible page */
+.wizard-buttons {
+  padding: 0;
+  -moz-appearance: statusbar;
+}
+
+.wizard-buttons button {
+  -moz-appearance: none;
+  min-height: 22px;
+  margin: 0 6px;
+  padding: 0 2px;
+  text-shadow: @loweredShadow@;
+  border: 1px solid @toolbarbuttonBorderColor@;
+  -moz-border-radius: @toolbarbuttonCornerRadius@;
+  -moz-box-shadow: @loweredShadow@;
+  background: @toolbarbuttonBackground@;
+  -moz-background-origin: border;
+}
+
+.wizard-buttons button:hover:active:not([disabled="true"]) {
+  background: @toolbarbuttonPressedBackgroundColor@;
+  text-shadow: @loweredShadow@;
+  -moz-box-shadow: @toolbarbuttonPressedInnerShadow@, @loweredShadow@;
+}
+
+:root:not([active]) .wizard-buttons button {
+  color: @toolbarbuttonInactiveFontColor@ !important; /* remove this when we support click-through, bug 392188 */
+  border-color: @toolbarbuttonInactiveBorderColor@;
+  background-image: @toolbarbuttonInactiveBackgroundImage@;
 }
 
-/**
- * License Page
- */
 .loadingBox {
   padding: 3px 5px 3px 5px;
 }
+
 .remoteLoadingThrobber {
   margin-top: 3px;
 }
+
 .remoteLoadingThrobber[state="loading"] {
   list-style-image: url("chrome://global/skin/icons/loading_16.png");
 }
+
 .remoteLoadingThrobber[state="error"] {
   list-style-image: url("chrome://global/skin/icons/notfound.png");
 }
 
-/**
- * Update Found Page
- */
-#updatesfoundContent {
-  -moz-margin-start: 8px;
-  -moz-margin-end: 8px;
+#updates[currentpageid="updatesfoundbasic"] .wizard-button[dlgtype="next"],
+#updates[currentpageid="updatesfoundbillboard"] .wizard-button[dlgtype="next"],
+#updates[currentpageid="finished"] .wizard-button[dlgtype="finish"],
+#updates[currentpageid="finishedBackground"] .wizard-button[dlgtype="finish"] {
+  font-weight: bold !important;
 }
 
-wizard[currentpageid="updatesfound"] .wizard-page-box {
-  margin: 0px;
+#incompatibleListbox, #finishedBackgroundMore, #acceptDeclineLicense {
+  margin-bottom: 6px;
 }
 
-#moreDetails {
-  margin: 1px 0px 4px 3px;
-}
-
-#updateMoreInfoURL, #updateMoreInfoURLLabel {
-  -moz-margin-start: 0px;
-  -moz-margin-end: 0px;
-}
-
-#downloadNow {
-  font-weight: bold;
-}
-
-#downloadNow, #downloadLater {
-  margin: 0px;
+#licenseContent, #incompatibleListbox {
+  -moz-margin-start: 6px;
+  -moz-margin-end: 6px;
 }
 
+/* Update Found Basic Page */
 #updateName, #updateFinishedName {
   font-weight: bold;
   font-size: larger;
-  -moz-margin-start: 0px;
 }
 
-#separatorGroove {
-  display: none;
+/* License Page */
+#licenseContent {
+  -moz-appearance: listbox;
 }
 
-#alertImage {
-  list-style-image: url("chrome://global/skin/icons/Warning.png");
-  margin-right: 5px;
-}
-
-#incompatibleWarning {
-  background-color: InfoBackground;
-  color: InfoText;
-  border: 1px outset InfoBackground;
-  padding: 3px;
-  margin: 1px 5px 4px 5px;
-}
-
-/**
- * Downloading Page
- */
+/* Downloading Page */
 #downloadStatusTop, #downloadStatusLine {
   -moz-box-align: center;
 }
 
-#downloadThrobber {
-  margin-left: 5px;
-  list-style-image: url("chrome://global/skin/icons/notloading_16.png");
-}
-
-#downloadThrobber[state="loading"] {
-  list-style-image: url("chrome://global/skin/icons/loading_16.png");
+#downloadStatus {
+  height: 3em !important;
 }
 
 #downloadStatusProgress {
@@ -136,8 +129,8 @@ wizard[currentpageid="updatesfound"] .wizard-page-box {
   min-width: 16px;
   max-height: 16px;
   max-width: 16px;
-  padding: 0;
   margin: 0 1px 0 1px;
+  padding: 0;
 }
 
 /* !Important must be used otherwise this won't immediately take affect */
@@ -174,9 +167,7 @@ wizard[currentpageid="updatesfound"] .wizard-page-box {
   list-style-image: url("chrome://global/skin/icons/notfound.png");
 }
 
-/**
- * Error Page
- */
+/* Error Page */
 #errorReason {
   margin-top: 1px;
   margin-bottom: 2px;
@@ -185,9 +176,7 @@ wizard[currentpageid="updatesfound"] .wizard-page-box {
   font-weight: bold;
 }
 
-/**
- * Update History Window
- */
+/* Update History Window */
 update {
   border-bottom: 1px dotted #C0C0C0;
 }
@@ -200,10 +189,6 @@ update {
   -moz-box-align: end;
 }
 
-.update-details-link {
-  margin: 0px;
-}
-
 .update-type {
   font-weight: bold;
   color: #990000;
@@ -218,14 +203,3 @@ update {
 #historyItems > scrollbox {
   margin-bottom: 1px;
 }
-
-/**
- * Advanced Preferences
- */
-.updatePrefsInfo {
-  font-size: smaller;
-  margin-top: 5px;
-  margin-bottom: 10px;
-  -moz-margin-start: 22px;
-  -moz-margin-end: 10px;
-}