13 files changed, 121 insertions, 91 deletions
diff --git a/data/branding/icecat/branding.nsi b/data/branding/icecat/branding.nsi
index 57a76b2..7d4a6f8 100644
--- a/data/branding/icecat/branding.nsi
+++ b/data/branding/icecat/branding.nsi
@@ -8,21 +8,26 @@
 
 # BrandFullNameInternal is used for some registry and file system values
 # instead of BrandFullName and typically should not be modified.
-!define BrandFullNameInternal "GNU IceCat"
+!define BrandFullNameInternal "IceCat"
+!define BrandFullName         "IceCat"
 !define CompanyName           "GNU"
-!define URLInfoAbout          "http://www.gnu.org/software/gnuzilla/"
+!define URLInfoAbout          "https://www.gnu.org/software/gnuzilla/"
 !define URLUpdateInfo         "https://savannah.gnu.org/projects/gnuzilla/"
-!define HelpLink              "http://libreplanet.org/wiki/Group:IceCat/ "
+!define HelpLink              "https://libreplanet.org/wiki/Group:IceCat/ "
 
 ; The OFFICIAL define is a workaround to support different urls for Release and
 ; Beta since they share the same branding when building with other branches that
 ; set the update channel to beta.
 !define OFFICIAL
+!define URLStubDownload32 "https://www.gnu.org/software/gnuzilla/"
+!define URLStubDownload64 "https://www.gnu.org/software/gnuzilla/"
+!define URLManualDownload "https://www.gnu.org/software/gnuzilla/"
+!define URLSystemRequirements "https://www.gnu.org/software/gnuzilla/"
 !define Channel "release"
 
 # The installer's certificate name and issuer expected by the stub installer
 !define CertNameDownload   "Mozilla Corporation"
-!define CertIssuerDownload "DigiCert Assured ID Code Signing CA-1"
+!define CertIssuerDownload "DigiCert SHA2 Assured ID Code Signing CA"
 
 # Dialog units are used so the UI displays correctly with the system's DPI
 # settings.
diff --git a/data/branding/icecat/content/about-wordmark.svg b/data/branding/icecat/content/about-wordmark.svg
new file mode 100644
index 0000000..06fcb88
--- /dev/null
+++ b/data/branding/icecat/content/about-wordmark.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="aboutWordmark"
+   x="0px"
+   y="0px"
+   width="130px"
+   height="38px"
+   viewBox="0 0 130 38"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="about-wordmark.svg"><metadata
+     id="metadata9"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1918"
+     inkscape:window-height="1012"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="3.4606064"
+     inkscape:cx="30.670164"
+     inkscape:cy="14.653469"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="text4134" /><g
+     style="font-style:normal;font-weight:normal;font-size:44.76259232px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     id="text4134"><path
+       d="m 8.4557943,36.219688 -6.5570204,0 0,-31.8234051 6.5570204,0 0,31.8234051 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Sans;-inkscape-font-specification:'Sans Bold';fill:#f2f2f2;fill-opacity:1"
+       id="path4139" /><path
+       d="m 23.930363,31.564204 q 1.748539,0 2.841375,-0.961696 1.092837,-0.961697 1.13655,-2.557238 l 5.923175,0 q -0.02186,2.40424 -1.311404,4.41506 -1.289547,1.988963 -3.540791,3.103656 -2.229387,1.092837 -4.939622,1.092837 -5.070762,0 -7.999564,-3.21294 -2.928803,-3.234797 -2.928803,-8.917548 l 0,-0.415278 q 0,-5.464183 2.906946,-8.720837 2.906946,-3.256653 7.977708,-3.256653 4.436917,0 7.103439,2.535381 2.688378,2.513525 2.732091,6.710018 l -5.923175,0 q -0.04371,-1.835966 -1.13655,-2.972516 -1.092836,-1.158407 -2.885089,-1.158407 -2.20753,0 -3.34408,1.617398 -1.114694,1.595542 -1.114694,5.201903 l 0,0.655702 q 0,3.650075 1.114694,5.245616 1.114693,1.595542 3.387794,1.595542 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Sans;-inkscape-font-specification:'Sans Bold';fill:#f2f2f2;fill-opacity:1"
+       id="path4141" /><path
+       d="m 48.322478,36.656823 q -5.201903,0 -8.480413,-3.191083 -3.256654,-3.191083 -3.256654,-8.50227 l 0,-0.611988 q 0,-3.562648 1.376975,-6.36031 1.376974,-2.819519 3.890498,-4.327634 2.535382,-1.529971 5.770178,-1.529971 4.852195,0 7.628001,3.059943 2.797662,3.059943 2.797662,8.677123 l 0,2.579095 -15.05929,0 q 0.305994,2.316814 1.835965,3.715645 1.551828,1.398831 3.912356,1.398831 3.650074,0 5.704607,-2.644665 l 3.103657,3.475221 q -1.420688,2.010819 -3.846785,3.14737 -2.426098,1.114693 -5.376757,1.114693 z m -0.721272,-19.40878 q -1.87968,0 -3.059943,1.26769 -1.158407,1.267691 -1.486258,3.628218 l 8.786407,0 0,-0.502705 Q 51.797699,19.543 50.704862,18.40645 49.612025,17.248043 47.601206,17.248043 Z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Sans;-inkscape-font-specification:'Sans Bold';fill:#f2f2f2;fill-opacity:1"
+       id="path4143" /><path
+       d="m 87.052612,25.619172 q -0.371565,5.136333 -3.803072,8.086992 -3.409651,2.950659 -9.004975,2.950659 -6.119885,0 -9.63882,-4.109066 -3.497077,-4.130923 -3.497077,-11.321788 l 0,-1.94525 q 0,-4.589914 1.617398,-8.086992 1.617399,-3.4970771 4.611771,-5.3548996 3.01623,-1.8796791 6.994155,-1.8796791 5.507897,0 8.873835,2.9506591 3.365937,2.9506592 3.890498,8.2837026 l -6.55702,0 q -0.240424,-3.0818 -1.726682,-4.458774 -1.464401,-1.3988311 -4.480631,-1.3988311 -3.27851,0 -4.917765,2.3605271 -1.617398,2.338671 -1.661112,7.278293 l 0,2.404241 q 0,5.158189 1.551828,7.540573 1.573685,2.382384 4.939622,2.382384 3.038086,0 4.524344,-1.376974 1.508115,-1.398831 1.726682,-4.305777 l 6.557021,0 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Sans;-inkscape-font-specification:'Sans Bold';fill:#f2f2f2;fill-opacity:1"
+       id="path4145" /><path
+       d="m 104.64728,36.219688 q -0.43713,-0.852412 -0.63384,-2.120103 -2.29496,2.557238 -5.96689,2.557238 -3.475221,0 -5.770178,-2.010819 -2.2731,-2.01082 -2.2731,-5.070763 0,-3.759358 2.775805,-5.770178 2.797662,-2.010819 8.065133,-2.032676 l 2.90695,0 0,-1.355118 q 0,-1.639255 -0.85242,-2.622808 -0.83055,-0.983553 -2.64466,-0.983553 -1.595542,0 -2.513524,0.764986 -0.896126,0.764986 -0.896126,2.098246 l -6.316597,0 q 0,-2.054533 1.267691,-3.803071 1.26769,-1.748539 3.584504,-2.732092 2.316814,-1.00541 5.201902,-1.00541 4.37135,0 6.92859,2.20753 2.57909,2.185674 2.57909,6.163599 l 0,10.250809 q 0.0219,3.365937 0.93984,5.092619 l 0,0.371564 -6.38217,0 z m -5.223756,-4.393203 q 1.398836,0 2.579096,-0.611989 1.18026,-0.633845 1.74854,-1.682968 l 0,-4.065353 -2.36053,0 q -4.742911,0 -5.048905,3.27851 l -0.02186,0.371565 q 0,1.180263 0.830556,1.945249 0.830556,0.764986 2.2731,0.764986 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Sans;-inkscape-font-specification:'Sans Bold';fill:#f2f2f2;fill-opacity:1"
+       id="path4147" /><path
+       d="m 122.54795,6.7568103 0,5.8138917 4.0435,0 0,4.633627 -4.0435,0 0,11.802637 q 0,1.311404 0.50271,1.879679 0.5027,0.568275 1.92339,0.568275 1.04912,0 1.85782,-0.152997 l 0,4.786625 q -1.85782,0.568275 -3.82493,0.568275 -6.64444,0 -6.77558,-6.710017 l 0,-12.742477 -3.45337,0 0,-4.633627 3.45337,0 0,-5.8138917 6.31659,0 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Sans;-inkscape-font-specification:'Sans Bold';fill:#f2f2f2;fill-opacity:1"
+       id="path4149" /></g></svg>
+\ No newline at end of file
diff --git a/data/branding/icecat/content/aboutDialog.css b/data/branding/icecat/content/aboutDialog.css
index 46ba1b7..6312a59 100644
--- a/data/branding/icecat/content/aboutDialog.css
+++ b/data/branding/icecat/content/aboutDialog.css
@@ -2,15 +2,20 @@
  * 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/. */
 
+#aboutDialogContainer {
+  background-color: #202340;
+  color: #fff;
+}
+
 #clientBox {
-  background-color: #F7F7F7;
-  color: #222222;
+  padding: 10px 0 15px;
 }
 
 #leftBox {
   background-image: url("chrome://branding/content/about-logo.png");
   background-repeat: no-repeat;
   background-size: 192px auto;
+  background-position: center 20%;
   /* min-width and min-height create room for the logo */
   min-width: 210px;
   min-height: 210px;
@@ -25,13 +30,23 @@
   }
 }
 
+.text-link {
+  color: #fff !important;
+  text-decoration: underline;
+}
+
+.text-link:-moz-focusring {
+  border-color: #fff;
+}
+
 #rightBox {
   margin-left: 30px;
   margin-right: 30px;
 }
 
-#updateDeck > hbox > label:not([class="text-link"]) {
-  color: #909090;
+#bottomBox {
+  background-color: hsla(235, 43%, 10%, .5);
+  padding: 15px 10px 15px;
 }
 
 #trademark {
diff --git a/data/branding/icecat/content/jar.mn b/data/branding/icecat/content/jar.mn
index 4b8c5fc..40e013e 100644
--- a/data/branding/icecat/content/jar.mn
+++ b/data/branding/icecat/content/jar.mn
@@ -7,12 +7,11 @@ browser.jar:
   content/branding/about.png
   content/branding/about-logo.png
   content/branding/about-logo@2x.png
-  content/branding/about-wordmark.png
-  content/branding/icon48.png
-  content/branding/icon64.png
+  content/branding/about-wordmark.svg
   content/branding/icon16.png                    (../default16.png)
   content/branding/icon32.png                    (../default32.png)
-  content/branding/icon128.png                   (../mozicon128.png)
+  content/branding/icon48.png                    (../default48.png)
+  content/branding/icon64.png                    (../default64.png)
+  content/branding/icon128.png                   (../default128.png)
   content/branding/identity-icons-brand.svg
-  content/branding/silhouette-40.svg
   content/branding/aboutDialog.css
diff --git a/data/branding/icecat/content/silhouette-40.svg b/data/branding/icecat/content/silhouette-40.svg
deleted file mode 100644
index 72d2291..0000000
--- a/data/branding/icecat/content/silhouette-40.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   x="0px"
-   y="0px"
-   viewBox="-45 31 40 40"
-   enable-background="new -45 31 40 40"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   width="100%"
-   height="100%"
-   sodipodi:docname="silhouette-40.svg">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1364"
-     inkscape:window-height="711"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="13.597656"
-     inkscape:cx="20"
-     inkscape:cy="20"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <path
-     style="fill:#cccccc;fill-opacity:1"
-     d="m -29.459925,62.826172 c -4.282871,-1.498444 -7.01554,-5.271633 -7.038444,-9.718502 -0.0069,-1.336809 0.192968,-2.876549 0.48876,-3.765461 0.275225,-0.827077 0.712775,-2.451219 0.972332,-3.609184 0.766254,-3.418421 2.81783,-5.875581 5.79156,-6.936486 2.71284,-0.967833 7.410895,-0.263677 9.569525,1.434298 0.731058,0.57505 0.839662,0.590069 1.085873,0.150115 0.240694,-0.430097 0.432202,-0.377031 1.593597,0.441595 1.121801,0.790717 1.572211,0.924624 2.999426,0.89172 0.923673,-0.02127 1.679404,0.06969 1.679404,0.202194 0,0.132503 -0.332903,0.692117 -0.739783,1.243652 -0.406881,0.551479 -0.829045,1.626681 -0.938144,2.389329 -0.109101,0.76265 -0.476233,1.690884 -0.815854,2.062731 -0.564659,0.61822 -0.587327,0.806767 -0.264919,2.20349 0.604832,2.620302 0.439528,4.871804 -0.584387,7.959636 -1.041195,3.139961 -2.179996,4.686981 -3.844982,5.223227 -1.584569,0.510408 -8.336739,0.393455 -9.953964,-0.172354 z m 5.669233,-1.663126 -0.3825,-0.692466 -0.171999,0.902282 c -0.123252,0.646598 -0.04155,0.95458 0.28829,1.086823 0.608784,0.244005 0.746551,-0.427023 0.266209,-1.296639 z m 3.352123,1.284001 c 0,-0.278645 -0.82974,-1.224594 -1.074165,-1.224594 -0.07089,0 -0.128899,0.338391 -0.128899,0.75193 0,0.551423 0.160408,0.75193 0.601532,0.75193 0.330842,0 0.601532,-0.125698 0.601532,-0.279266 z m 1.884127,-0.502057 c 0.240948,-0.240958 -0.0744,-1.023297 -0.412477,-1.023297 -0.147724,0 -0.268587,0.27069 -0.268587,0.601577 0,0.586232 0.319012,0.783749 0.681064,0.42172 z m -7.179229,-0.597967 c 0.100673,-0.262341 0.07,-0.678983 -0.06816,-0.925865 -0.206691,-0.369364 -0.337239,-0.317573 -0.736738,0.292129 -0.267046,0.407559 -0.40235,0.824201 -0.30068,0.925865 0.341831,0.341832 0.921037,0.188771 1.105583,-0.292129 z m -5.206852,-1.555369 c -3.206778,-3.206816 -4.013595,-7.760032 -1.713328,-9.669081 0.855182,-0.70973 1.643643,-0.05585 2.941517,2.438582 2.813889,5.408671 5.089386,7.494362 8.206872,7.522402 1.716451,0.01523 2.799811,-0.463412 3.836249,-1.695566 0.854132,-1.015455 1.742132,-3.696519 1.742132,-5.259898 0,-2.411897 -0.296643,-3.348029 -1.165658,-3.678409 -2.086591,-0.793341 -2.840825,-1.317683 -3.227892,-2.244055 -0.594447,-1.422731 -1.016225,-1.548654 -1.820437,-0.543637 -0.846961,1.058501 -0.941663,3.50532 -0.208504,5.387119 0.782503,2.008457 1.451423,4.620183 1.237989,4.83361 -0.39178,0.391818 -1.758031,-0.198081 -2.013184,-0.869222 -0.142339,-0.374385 -0.475913,-0.860871 -0.741277,-1.081068 -0.265364,-0.220253 -0.482481,-0.636331 -0.482481,-0.924623 0,-0.288236 -0.265807,-0.862057 -0.590682,-1.275032 -0.685221,-0.871139 -1.189959,-2.641401 -1.481225,-5.195131 -0.300251,-2.632545 -0.675449,-3.158072 -2.254653,-3.158072 -1.446422,0 -3.023015,0.953284 -4.527204,2.737311 -2.811571,3.334715 -2.706233,8.708294 0.234598,11.967409 0.657167,0.728292 3.14076,2.438977 3.540969,2.438977 0.119802,0 -0.56141,-0.779236 -1.513801,-1.731616 z m 3.409983,0.170719 c 0.62654,-0.894497 0.420769,-0.986288 -0.692941,-0.308998 -0.514327,0.312777 -0.845396,0.658447 -0.735708,0.768122 0.383182,0.383186 0.970975,0.194301 1.428649,-0.459124 z m -1.254282,-1.388769 c 1.133918,-0.973819 0.27441,-1.331336 -0.945553,-0.393341 -0.409113,0.314526 -0.627399,0.703354 -0.505558,0.900476 0.225411,0.364738 0.580305,0.240733 1.451111,-0.507135 z M -30.21346,56.85203 c 0.496264,-0.406769 0.794068,-0.740251 0.661788,-0.741098 -0.473774,-0.0057 -2.015234,0.922084 -2.015234,1.209305 0,0.461494 0.379404,0.33021 1.353446,-0.468207 z m -0.150383,-2.002194 c 0,-0.366656 -1.894056,0.475316 -2.037534,0.90578 -0.08375,0.251227 0.224653,0.204625 0.956982,-0.144597 0.594303,-0.283385 1.080552,-0.62595 1.080552,-0.761183 z m -0.902298,-2.097426 c 0,-0.330888 -1.480537,0.692579 -1.494376,1.033057 -0.0052,0.127898 0.32891,0.01072 0.742463,-0.260197 0.413552,-0.270972 0.751913,-0.618728 0.751913,-0.77286 z m 2.603125,-9.825131 c -0.273771,-0.30251 -0.497763,-0.791218 -0.497763,-1.086005 0,-0.457697 0.09034,-0.432275 0.618514,0.174065 0.581847,0.667935 0.599677,0.671095 0.300765,0.05309 -0.519424,-1.07392 -0.362327,-1.415843 0.300767,-0.654621 0.616371,0.70758 0.617365,0.707675 0.286855,0.02708 -0.415677,-0.855957 -0.121476,-1.443961 0.474854,-0.949053 0.233403,0.193711 0.424371,0.51235 0.424371,0.70809 0,0.195739 0.356492,0.82205 0.792204,1.391842 0.435712,0.569758 0.696922,0.765245 0.580468,0.434357 -0.116454,-0.330831 -0.290592,-1.007569 -0.386972,-1.503832 l -0.175238,-0.902298 0.66581,0.589572 c 0.567604,0.502611 0.706789,0.524793 0.943611,0.150385 0.152791,-0.241556 0.279871,-0.288777 0.282405,-0.10494 0.0027,0.193786 0.320582,0.273848 0.756519,0.190514 0.483184,-0.09236 0.751916,-0.0071 0.751916,0.238703 0,0.255433 0.199766,0.201657 0.601532,-0.161936 0.341125,-0.308715 0.601532,-0.393996 0.601532,-0.196997 0,0.191062 0.33836,0.347383 0.751914,0.347383 1.219033,0 0.873478,-0.43289 -1.096272,-1.373338 -3.245522,-1.549558 -8.20055,-1.103455 -9.852504,0.887033 -0.464142,0.559253 -0.131294,1.310219 0.362056,0.816905 0.230613,-0.230612 0.483679,-0.08718 0.88242,0.500139 l 0.559076,0.823524 -0.164666,-1.203116 -0.164666,-1.203066 0.482221,1.052685 c 0.26522,0.579 0.637515,1.152144 0.827321,1.273667 0.580457,0.371678 0.613046,0.257093 0.09095,-0.31983 z m 13.938997,-0.05134 c 0.349548,-0.225894 0.258394,-0.29258 -0.404743,-0.29619 -0.470741,0 -1.254696,-0.240157 -1.742123,-0.528088 -0.776271,-0.458554 -0.921399,-0.467881 -1.169672,-0.0752 -0.438756,0.694001 -0.343574,1.015409 0.173592,0.586187 0.385152,-0.31966 0.553293,-0.299909 0.966746,0.113567 0.557349,0.557347 1.490332,0.642932 2.1762,0.199717 z m -17.143654,-0.433402 c 0,-0.07294 -0.135343,-0.216282 -0.300765,-0.318516 -0.165421,-0.102234 -0.300765,-0.04254 -0.300765,0.132631 0,0.175188 0.135344,0.318527 0.300765,0.318527 0.165422,0 0.300765,-0.05969 0.300765,-0.132642 z"
-     id="path2998"
-     inkscape:connector-curvature="0" />
-</svg>
diff --git a/data/branding/icecat/default128.png b/data/branding/icecat/default128.png
new file mode 100644
index 0000000..6d922fd
--- /dev/null
+++ b/data/branding/icecat/default128.png
diff --git a/data/branding/icecat/default64.png b/data/branding/icecat/default64.png
new file mode 100644
index 0000000..16e1d6e
--- /dev/null
+++ b/data/branding/icecat/default64.png
diff --git a/data/branding/icecat/locales/en-US/brand.ftl b/data/branding/icecat/locales/en-US/brand.ftl
new file mode 100644
index 0000000..bd7fbe0
--- /dev/null
+++ b/data/branding/icecat/locales/en-US/brand.ftl
@@ -0,0 +1,5 @@
+# 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/.
+
+-brand-short-name = IceCat
diff --git a/data/branding/icecat/locales/en-US/brand.properties b/data/branding/icecat/locales/en-US/brand.properties
index 73ef208..85e2894 100644
--- a/data/branding/icecat/locales/en-US/brand.properties
+++ b/data/branding/icecat/locales/en-US/brand.properties
@@ -4,13 +4,7 @@
 
 brandShorterName=IceCat
 brandShortName=IceCat
-brandFullName=Mozilla IceCat
-vendorShortName=Mozilla
-
-homePageSingleStartMain=IceCat Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
-
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
+brandFullName=IceCat
+vendorShortName=GNU
 
 syncBrandShortName=Sync
diff --git a/data/branding/icecat/locales/jar.mn b/data/branding/icecat/locales/jar.mn
index 731a24b..c78c829 100644
--- a/data/branding/icecat/locales/jar.mn
+++ b/data/branding/icecat/locales/jar.mn
@@ -3,9 +3,11 @@
 # 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/.
 
+[localization] @AB_CD@.jar:
+  branding                                          (%*.ftl)
 
 @AB_CD@.jar:
 % locale branding @AB_CD@ %locale/branding/
   locale/branding/brand.dtd        (%brand.dtd)
   locale/branding/brand.properties (%brand.properties)
-  locale/branding/browserconfig.properties (browserconfig.properties)
+  locale/branding/browserconfig.properties
diff --git a/data/branding/icecat/locales/moz.build b/data/branding/icecat/locales/moz.build
index c97072b..eb4454d 100644
--- a/data/branding/icecat/locales/moz.build
+++ b/data/branding/icecat/locales/moz.build
@@ -1,4 +1,4 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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
diff --git a/data/branding/icecat/moz.build b/data/branding/icecat/moz.build
index e613901..72f0f52 100644
--- a/data/branding/icecat/moz.build
+++ b/data/branding/icecat/moz.build
@@ -11,4 +11,3 @@ export('DIST_SUBDIR')
 
 include('../branding-common.mozbuild')
 IceCatBranding()
-
diff --git a/data/branding/icecat/pref/icecat-branding.js b/data/branding/icecat/pref/icecat-branding.js
index 84b9c63..aecf8eb 100644
--- a/data/branding/icecat/pref/icecat-branding.js
+++ b/data/branding/icecat/pref/icecat-branding.js
@@ -4,12 +4,15 @@
 
 pref("startup.homepage_override_url","http://www.gnu.org");
 pref("startup.homepage_welcome_url","http://www.gnu.org/software/gnuzilla/");
-// The time interval between checks for a new version (in seconds)
-// nightly=8 hours, official=24 hours
-pref("app.update.interval", 86400);
+pref("startup.homepage_welcome_url.additional", "");
+// Interval: Time between checks for a new version (in seconds)
+pref("app.update.interval", 43200); // 12 hours
 // The time interval between the downloading of mar file chunks in the
 // background (in seconds)
-pref("app.update.download.backgroundInterval", 60);
+// 0 means "download everything at once"
+pref("app.update.download.backgroundInterval", 0);
+// Give the user x seconds to react before showing the big UI. default=192 hours
+pref("app.update.promptWaitTime", 691200);
 // URL user can browse to manually if for some reason all update installation
 // attempts fail.
 pref("app.update.url.manual", "http://www.gnu.org/software/gnuzilla/");
@@ -17,15 +20,19 @@ pref("app.update.url.manual", "http://www.gnu.org/software/gnuzilla/");
 // supplied in the "An update is available" page of the update wizard.
 pref("app.update.url.details", "http://www.gnu.org/software/gnuzilla/");
 
+
 // Release notes and vendor URLs
 pref("app.releaseNotesURL", "http://www.gnu.org/software/gnuzilla/");
 pref("app.vendorURL", "http://www.gnu.org/");
 
-// Search codes belong only in builds with official branding
-pref("browser.search.param.yahoo-fr", "");
-pref("browser.search.param.yahoo-fr-cjkt", ""); // now unused
-pref("browser.search.param.yahoo-fr-ja", "");
-pref("browser.search.param.yahoo-f-CN", "");
+// The number of days a binary is permitted to be old
+// without checking for an update.  This assumes that
+// app.update.checkInstallTime is true.
+pref("app.update.checkInstallTime.days", 63);
+
+// Give the user x seconds to reboot before showing a badge on the hamburger
+// button. default=4 days
+pref("app.update.badgeWaitTime", 345600);
 
 // Number of usages of the web console or scratchpad.
 // If this is less than 5, then pasting code into the web console or scratchpad is disabled