Update branding

34 files changed, 263 insertions, 90 deletions

diff --git a/browser/branding/official/VisualElements_150.png b/browser/branding/official/VisualElements_150.png
index f46b957c2f..70b256398e 100644
--- a/browser/branding/official/VisualElements_150.png
+++ b/browser/branding/official/VisualElements_150.png
diff --git a/browser/branding/official/VisualElements_70.png b/browser/branding/official/VisualElements_70.png
index b45a3400f7..64ce3276d2 100644
--- a/browser/branding/official/VisualElements_70.png
+++ b/browser/branding/official/VisualElements_70.png
diff --git a/browser/branding/official/firefox.VisualElementsManifest.xml b/browser/branding/official/basilisk.VisualElementsManifest.xml
index d675d573f2..d675d573f2 100644
--- a/browser/branding/official/firefox.VisualElementsManifest.xml
+++ b/browser/branding/official/basilisk.VisualElementsManifest.xml
diff --git a/browser/branding/official/branding.nsi b/browser/branding/official/branding.nsi
index 5960f3107a..24b0f4bba6 100644
--- a/browser/branding/official/branding.nsi
+++ b/browser/branding/official/branding.nsi
@@ -8,24 +8,24 @@
 
 # BrandFullNameInternal is used for some registry and file system values
 # instead of BrandFullName and typically should not be modified.
-!define BrandFullNameInternal "Mozilla Firefox"
-!define CompanyName           "Mozilla Corporation"
-!define URLInfoAbout          "https://www.mozilla.org"
-!define URLUpdateInfo         "https://www.mozilla.org/firefox/${AppVersion}/releasenotes"
-!define HelpLink              "https://support.mozilla.org"
+!define BrandFullNameInternal "Basilisk"
+!define CompanyName           "Moonchild Productions"
+!define URLInfoAbout          "https://www.basilisk-browser.org"
+!define URLUpdateInfo         "https://www.basilisk-browser.org/releasenotes.shtml"
+!define HelpLink              "https://www.basilisk-browser.org"
 
 ; 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 URLStubDownload "http://download.mozilla.org/?os=win&lang=${AB_CD}&product=firefox-latest"
-!define URLManualDownload "https://www.mozilla.org/${AB_CD}/firefox/installer-help/?channel=release&installer_lang=${AB_CD}"
-!define URLSystemRequirements "https://www.mozilla.org/firefox/system-requirements/"
+!define URLStubDownload ""
+!define URLManualDownload ""
+!define URLSystemRequirements ""
 !define Channel "release"
 
 # The installer's certificate name and issuer expected by the stub installer
-!define CertNameDownload   "Mozilla Corporation"
-!define CertIssuerDownload "DigiCert SHA2 Assured ID Code Signing CA"
+!define CertNameDownload   ""
+!define CertIssuerDownload ""
 
 # Dialog units are used so the UI displays correctly with the system's DPI
 # settings.
diff --git a/browser/branding/official/configure.sh b/browser/branding/official/configure.sh
index 92ef14e03f..49126c4aaa 100644
--- a/browser/branding/official/configure.sh
+++ b/browser/branding/official/configure.sh
@@ -2,4 +2,4 @@
 # 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/.
 
-MOZ_APP_DISPLAYNAME=Firefox
+MOZ_APP_DISPLAYNAME=Basilisk
diff --git a/browser/branding/official/content/about-logo.png b/browser/branding/official/content/about-logo.png
index c7c5ac2b82..a6c89cf2c4 100644
--- a/browser/branding/official/content/about-logo.png
+++ b/browser/branding/official/content/about-logo.png
diff --git a/browser/branding/official/content/about-logo@2x.png b/browser/branding/official/content/about-logo@2x.png
index 624ad150f8..761e47f6e7 100644
--- a/browser/branding/official/content/about-logo@2x.png
+++ b/browser/branding/official/content/about-logo@2x.png
diff --git a/browser/branding/official/content/about-wordmark.png b/browser/branding/official/content/about-wordmark.png
index c9651b520f..4ac8d3557f 100644
--- a/browser/branding/official/content/about-wordmark.png
+++ b/browser/branding/official/content/about-wordmark.png
diff --git a/browser/branding/official/content/about.png b/browser/branding/official/content/about.png
index 7d78057dc5..4fc6e5c36e 100644
--- a/browser/branding/official/content/about.png
+++ b/browser/branding/official/content/about.png
diff --git a/browser/branding/official/content/aboutDialog.css b/browser/branding/official/content/aboutDialog.css
index 46ba1b7712..631f06a720 100644
--- a/browser/branding/official/content/aboutDialog.css
+++ b/browser/branding/official/content/aboutDialog.css
@@ -28,8 +28,14 @@
 #rightBox {
   margin-left: 30px;
   margin-right: 30px;
+  background-image: url("chrome://branding/content/about-wordmark.png");
+  background-repeat: no-repeat;
+  /* padding-top creates room for the wordmark */
+  padding-top: 38px;
+  margin-top:20px;
 }
 
+
 #updateDeck > hbox > label:not([class="text-link"]) {
   color: #909090;
 }
diff --git a/browser/branding/official/content/icon48.png b/browser/branding/official/content/icon48.png
index 10de891724..e7dcd8ae2c 100644
--- a/browser/branding/official/content/icon48.png
+++ b/browser/branding/official/content/icon48.png
diff --git a/browser/branding/official/content/icon64.png b/browser/branding/official/content/icon64.png
index ac94fb47de..7bad34f8b2 100644
--- a/browser/branding/official/content/icon64.png
+++ b/browser/branding/official/content/icon64.png
diff --git a/browser/branding/official/content/identity-icons-brand.svg b/browser/branding/official/content/identity-icons-brand.svg
index 380e4e5974..80d2155c2a 100644
--- a/browser/branding/official/content/identity-icons-brand.svg
+++ b/browser/branding/official/content/identity-icons-brand.svg
@@ -1,7 +1,77 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- 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 xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
-  <path fill="#ff9500" d="M26.797,6.125 C26.719,6.050 26.674,6.013 26.674,6.013 C26.715,6.045 26.756,6.082 26.797,6.125 M28.924,21.127 C28.947,20.948 28.949,20.780 28.929,20.626 C28.501,21.359 27.844,22.025 27.228,22.905 C27.980,22.421 28.624,21.866 28.924,21.127 ZM30.097,13.924 C30.082,13.747 30.062,13.570 30.036,13.394 C29.974,12.946 29.875,12.504 29.728,12.076 C29.735,12.102 29.741,12.129 29.747,12.155 C29.737,12.124 29.731,12.107 29.731,12.107 C29.731,12.107 29.614,12.472 29.435,13.070 C29.423,14.290 29.290,15.417 29.094,16.268 C29.419,15.962 29.657,15.599 29.820,15.196 C29.748,15.461 29.649,15.713 29.520,15.947 C29.361,16.217 29.182,16.436 29.009,16.610 C28.821,16.797 28.641,16.932 28.500,17.024 C28.543,16.905 28.585,16.773 28.625,16.631 C28.626,16.629 28.626,16.628 28.627,16.626 C28.637,16.590 28.647,16.552 28.657,16.513 C28.761,16.176 28.854,15.828 28.934,15.474 C29.049,14.961 29.137,14.433 29.192,13.898 C29.300,12.857 29.284,11.787 29.104,10.744 C29.015,10.227 28.886,9.717 28.712,9.220 C28.480,8.559 28.197,8.001 27.916,7.544 C27.895,7.508 27.874,7.472 27.853,7.436 C27.760,7.280 27.665,7.132 27.570,6.994 C27.258,6.543 26.939,6.200 26.674,6.013 C26.715,6.045 26.756,6.082 26.797,6.125 C26.719,6.050 26.674,6.013 26.674,6.013 C26.694,6.035 26.712,6.058 26.732,6.081 C26.682,6.033 26.653,6.008 26.653,6.008 C26.653,6.008 26.682,6.170 26.733,6.456 C25.969,5.218 24.807,4.635 24.807,4.635 C24.807,4.635 24.902,4.945 25.050,5.391 C25.741,5.949 26.345,6.571 26.869,7.227 C26.871,7.238 26.873,7.250 26.875,7.261 C26.905,7.435 26.938,7.624 26.973,7.826 C26.880,7.700 26.782,7.575 26.683,7.451 C25.589,5.958 24.211,4.706 22.611,3.779 C22.625,3.783 22.600,3.776 22.613,3.780 C20.672,2.647 18.429,2.000 16.039,2.000 C12.495,2.000 9.273,3.423 6.880,5.744 C6.814,5.809 7.271,6.270 7.404,6.311 C8.081,6.106 8.838,6.051 9.423,6.120 C9.705,5.897 9.663,5.963 9.961,5.769 L9.964,5.772 C11.767,4.606 13.854,3.982 16.035,3.982 C18.042,3.982 19.969,4.510 21.669,5.503 C22.118,5.635 22.683,5.830 23.182,6.091 C22.663,5.187 22.132,4.560 21.761,4.182 C23.311,5.364 24.150,6.425 24.701,7.396 C24.746,7.475 24.789,7.553 24.830,7.631 C24.928,7.816 25.017,7.998 25.099,8.177 C24.570,7.618 23.753,7.042 23.039,6.772 C22.981,6.750 22.924,6.730 22.868,6.712 C22.708,6.662 22.555,6.628 22.414,6.617 C23.550,7.488 25.407,9.978 25.432,13.744 C25.432,13.765 25.432,13.786 25.432,13.807 C25.432,14.010 25.428,14.216 25.417,14.427 C25.207,13.971 24.877,13.340 24.562,12.869 C24.483,12.751 24.405,12.644 24.330,12.551 C24.265,12.471 24.202,12.400 24.143,12.346 C24.479,15.517 24.324,16.750 24.116,17.651 C24.096,17.734 24.077,17.815 24.057,17.894 C24.015,18.058 23.973,18.216 23.934,18.378 C23.920,18.257 23.899,18.145 23.874,18.040 C23.816,17.791 23.735,17.585 23.666,17.424 C23.643,17.372 23.621,17.322 23.603,17.280 C23.603,17.280 23.581,17.854 23.325,18.780 C23.199,19.234 23.018,19.771 22.754,20.367 C22.294,21.408 21.823,21.903 21.501,22.062 C21.397,22.113 21.309,22.129 21.242,22.117 C21.167,22.112 21.126,22.079 21.127,22.076 C21.135,22.001 21.143,21.926 21.146,21.854 C21.150,21.754 21.145,21.662 21.119,21.593 C21.119,21.593 20.862,21.684 20.697,21.924 C20.630,22.020 20.544,22.115 20.431,22.203 C20.411,22.219 20.614,21.936 20.599,21.949 C20.499,22.033 20.392,22.130 20.285,22.245 C20.170,22.368 20.059,22.494 19.954,22.609 C19.699,22.887 19.483,23.095 19.352,23.001 C19.437,22.975 19.513,22.906 19.572,22.818 C19.635,22.726 19.680,22.613 19.699,22.500 C19.544,22.612 19.152,22.914 18.272,23.049 C18.109,23.074 17.707,23.146 17.127,23.121 C16.424,23.090 15.460,22.916 14.345,22.341 C14.578,22.313 14.903,22.241 15.196,22.312 C15.275,22.331 15.352,22.360 15.424,22.405 C15.392,22.369 15.355,22.338 15.315,22.310 C14.933,22.037 14.212,22.084 13.681,21.911 C13.170,21.744 12.503,21.005 12.119,20.631 C12.263,20.667 12.407,20.696 12.551,20.721 C12.652,20.738 12.752,20.753 12.852,20.765 C13.008,20.784 13.164,20.798 13.319,20.805 C14.486,20.856 15.595,20.569 16.313,20.063 C17.285,19.377 17.861,18.876 18.378,18.994 C18.428,19.006 18.476,19.010 18.522,19.010 C18.543,19.010 18.563,19.009 18.583,19.007 C18.867,18.975 19.053,18.730 19.002,18.441 C18.983,18.332 18.931,18.217 18.836,18.104 C18.561,17.778 18.016,17.375 17.274,17.265 C16.935,17.215 16.556,17.226 16.142,17.333 C15.385,17.528 14.711,18.047 13.824,18.051 C13.526,18.053 13.204,17.996 12.846,17.850 C12.759,17.815 12.671,17.774 12.580,17.728 C12.489,17.681 12.877,17.783 12.781,17.725 C12.508,17.621 12.011,17.386 11.888,17.297 C11.868,17.282 12.094,17.339 12.070,17.324 C10.721,16.501 10.809,15.842 10.809,15.435 C10.809,15.270 10.858,15.077 10.953,14.899 C11.046,14.723 11.183,14.563 11.362,14.461 C11.475,14.502 11.562,14.541 11.616,14.567 C11.655,14.586 11.677,14.598 11.677,14.598 C11.677,14.598 11.664,14.576 11.644,14.546 C11.613,14.499 11.565,14.428 11.530,14.386 C11.544,14.381 11.557,14.377 11.571,14.373 C11.665,14.406 11.829,14.468 11.985,14.532 C12.092,14.576 12.195,14.621 12.268,14.659 C12.514,14.786 12.596,14.916 12.596,14.916 C12.596,14.916 12.654,14.879 12.594,14.749 C12.583,14.726 12.560,14.683 12.519,14.630 C12.465,14.561 12.378,14.473 12.239,14.386 C12.244,14.386 12.248,14.385 12.251,14.385 C12.379,14.437 12.514,14.503 12.663,14.590 C12.670,14.555 12.679,14.520 12.687,14.484 C12.688,14.479 12.690,14.475 12.691,14.470 C12.693,14.462 12.695,14.454 12.697,14.446 C12.704,14.416 12.711,14.385 12.718,14.354 C12.730,14.301 12.740,14.245 12.748,14.185 C12.764,14.058 12.768,13.913 12.740,13.731 C12.695,13.446 12.701,13.373 12.632,13.269 C12.573,13.181 12.648,13.142 12.740,13.221 C12.718,13.151 12.687,13.081 12.650,13.010 C12.650,13.009 12.651,13.009 12.651,13.007 C12.659,12.968 12.693,12.919 12.745,12.864 C12.758,12.849 12.774,12.834 12.790,12.818 C12.805,12.803 12.821,12.789 12.839,12.773 C13.359,12.313 14.782,11.539 14.908,11.443 C15.118,11.283 15.332,11.035 15.466,10.750 C15.508,10.672 15.544,10.578 15.571,10.468 C15.606,10.323 15.625,10.149 15.614,9.937 C15.606,9.764 15.537,9.634 14.917,9.568 C14.584,9.533 14.091,9.516 13.362,9.521 C13.335,9.521 13.309,9.521 13.282,9.521 C12.690,9.526 12.305,9.171 12.073,8.833 C12.025,8.759 11.984,8.689 11.946,8.626 C11.895,8.532 11.861,8.448 11.834,8.381 C11.917,8.070 12.028,7.772 12.165,7.489 C12.456,6.890 12.871,6.355 13.419,5.893 C13.468,5.850 13.226,5.921 13.272,5.877 C13.327,5.824 13.669,5.655 13.733,5.618 C13.772,5.595 13.692,5.556 13.557,5.528 C13.549,5.527 13.541,5.525 13.532,5.524 C13.380,5.496 13.167,5.485 12.972,5.527 C12.581,5.610 12.505,5.658 12.303,5.765 C12.385,5.678 12.650,5.540 12.585,5.554 C12.161,5.652 11.661,5.940 11.235,6.251 C11.231,6.211 11.235,6.179 11.243,6.116 C11.042,6.223 10.557,6.609 10.433,6.903 C10.433,6.839 10.433,6.807 10.425,6.736 C10.299,6.856 10.177,6.996 10.065,7.151 C10.055,7.165 10.044,7.178 10.034,7.192 C10.033,7.195 10.031,7.197 10.029,7.199 C9.691,7.112 9.367,7.055 9.056,7.023 C8.305,6.944 7.631,7.012 7.032,7.178 C6.951,7.201 6.871,7.224 6.793,7.250 C6.579,7.089 6.235,6.843 5.692,5.978 C5.659,5.926 5.656,6.097 5.626,6.042 C5.468,5.748 5.327,5.300 5.258,4.892 C5.234,4.750 5.218,4.613 5.214,4.489 C5.214,4.489 5.050,4.588 4.873,4.889 C4.806,5.003 4.737,5.146 4.675,5.324 C4.662,5.361 4.649,5.399 4.637,5.439 C4.596,5.570 4.568,5.648 4.539,5.720 C4.530,5.742 4.556,5.482 4.546,5.502 C4.530,5.537 4.502,5.579 4.472,5.627 C4.431,5.692 4.385,5.769 4.356,5.851 C4.349,5.870 4.343,5.889 4.338,5.909 C4.308,6.034 4.259,6.110 4.239,6.266 C4.238,6.270 4.237,6.273 4.235,6.276 C4.234,6.261 4.233,6.230 4.231,6.200 C4.229,6.152 4.225,6.105 4.218,6.123 C4.118,6.397 4.024,6.712 3.948,7.067 C3.838,7.628 3.726,8.395 3.793,9.368 C3.792,9.403 3.795,9.438 3.797,9.472 C3.800,9.514 3.803,9.555 3.802,9.594 C3.461,10.078 3.239,10.494 3.153,10.699 C3.066,10.873 2.979,11.068 2.893,11.284 C2.564,12.102 2.241,13.234 1.969,14.813 C1.969,14.813 2.200,14.061 2.661,13.210 C2.321,14.282 2.055,15.950 2.211,18.452 C2.215,18.397 2.248,18.101 2.322,17.660 C2.360,17.435 2.408,17.173 2.470,16.885 C2.473,16.950 2.477,17.015 2.482,17.081 C2.497,17.315 2.519,17.556 2.548,17.803 C2.565,17.949 2.585,18.097 2.607,18.248 C2.814,19.617 3.265,21.166 4.197,22.811 C5.154,24.502 7.676,28.430 14.005,29.900 C13.826,29.847 13.665,29.780 13.524,29.710 C13.117,29.508 12.879,29.280 12.879,29.280 C12.879,29.280 13.080,29.346 13.407,29.439 C14.081,29.630 15.290,29.931 16.388,29.990 C16.586,30.000 16.781,30.004 16.968,29.996 C16.428,29.900 16.320,29.631 16.320,29.631 C16.320,29.631 21.233,29.917 23.785,27.837 C23.835,27.796 23.885,27.754 23.934,27.711 C23.938,27.709 23.941,27.708 23.945,27.706 C24.327,27.379 24.606,27.021 24.755,26.675 C24.636,26.734 24.518,26.789 24.403,26.841 C24.025,27.251 23.564,27.586 23.055,27.860 C22.590,27.996 22.118,28.072 21.749,28.108 C21.581,28.124 21.434,28.132 21.319,28.133 C21.594,27.872 21.957,27.681 22.387,27.495 C23.024,27.219 23.811,26.955 24.683,26.496 C24.685,26.495 24.687,26.494 24.689,26.493 C24.741,26.466 24.793,26.437 24.845,26.409 C25.598,25.996 26.410,25.432 27.244,24.585 C28.038,23.779 28.427,23.083 28.643,22.448 C28.703,22.270 28.750,22.097 28.788,21.928 C28.852,21.645 28.893,21.372 28.934,21.104 C28.934,21.103 28.934,21.101 28.934,21.100 C28.934,21.102 28.933,21.103 28.933,21.105 C28.926,21.144 28.918,21.183 28.910,21.221 C28.671,22.267 27.797,22.972 26.794,23.585 C26.608,23.698 26.417,23.808 26.226,23.917 C26.339,23.696 26.459,23.491 26.582,23.294 C26.586,23.289 26.589,23.284 26.592,23.279 C26.590,23.284 26.588,23.288 26.586,23.293 C26.573,23.319 26.561,23.344 26.550,23.367 C26.567,23.339 26.585,23.311 26.603,23.283 C26.798,22.973 27.012,22.669 27.232,22.372 C27.760,21.689 28.278,21.118 28.621,20.490 C28.672,20.397 28.726,20.292 28.782,20.177 C28.803,20.134 28.825,20.090 28.846,20.043 C29.220,19.292 29.607,18.267 29.857,17.120 C29.969,16.606 30.053,16.067 30.097,15.517 C30.138,14.992 30.142,14.457 30.097,13.924 Z"/>
+
+<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"
+   width="32"
+   height="32"
+   viewBox="0 0 32 32"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="identity-icons-brand.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="909"
+     inkscape:window-height="821"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="7.375"
+     inkscape:cx="16"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <g
+     transform="matrix(0.09806566,0,0,0.09806566,0.8046769,0.794967)"
+     id="g4695">
+    <circle
+       r="152.95874"
+       cy="155.04951"
+       cx="154.9505"
+       id="path4138"
+       style="fill:#159677;fill-opacity:1;stroke:none;stroke-width:1.02310705;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0" />
+    <ellipse
+       ry="141.58415"
+       rx="138.61386"
+       cy="155.54456"
+       cx="156.43564"
+       id="path4136"
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.65116278" />
+    <path
+       sodipodi:nodetypes="csssssssssssssssssssssssssssssssssccssssssssssssssssssssssscssssssssssssssssssscssssssssssscssssssssssssssssscs"
+       inkscape:connector-curvature="0"
+       id="path4158"
+       d="m 127.95182,303.54475 c -5.42765,-1.02093 -14.92656,-3.62133 -21.1087,-5.77867 -6.18214,-2.15735 -16.30326,-6.64613 -22.491383,-9.9751 -6.188122,-3.32895 -15.51351,-9.36105 -20.723085,-13.40464 -5.209574,-4.04361 -13.693816,-11.9823 -18.853871,-17.64159 -5.160055,-5.65926 -12.06401,-14.49733 -15.342124,-19.64014 -3.278112,-5.14282 -8.18276,-14.29065 -10.899218,-20.3285 -2.716457,-6.03785 -6.483488,-16.75495 -8.371181,-23.8158 -3.1894021,-11.92984 -3.4283741,-14.53982 -3.3785531,-36.89976 0.04858,-21.80859 0.360979,-25.24403 3.3358421,-36.68566 1.805227,-6.94309 5.548131,-17.66019 8.317568,-23.815802 2.769436,-6.15561 7.62586,-15.25077 10.792053,-20.21147 3.166194,-4.96071 9.969264,-13.68367 15.117932,-19.38435 5.148669,-5.70068 13.584686,-13.67575 18.746703,-17.72237 5.162016,-4.04663 14.534575,-10.17782 20.827907,-13.62488 6.29333,-3.447075 16.4997,-8.008262 22.68081,-10.135983 6.18112,-2.127723 16.53517,-4.7966559 23.00901,-5.9309599 6.47383,-1.134304 18.3156,-2.062372 26.31504,-2.062372 7.99944,0 19.82639,0.945049 26.28214,2.10011 21.43411,3.8349939 41.18811,12.0048139 59.18524,24.4777049 5.61631,3.89237 14.25757,10.97893 19.20284,15.7479 4.94527,4.76898 12.60023,13.67935 17.01106,19.80084 4.4108,6.12148 10.53577,16.44926 13.61104,22.95063 3.07526,6.50136 6.78194,15.890682 8.23707,20.865142 4.02216,13.75005 6.31582,29.59534 6.31582,43.63152 0,6.96612 -0.83802,17.67103 -1.86224,23.78868 -1.02423,6.11765 -3.25757,15.70525 -4.96297,21.3058 -1.70539,5.60055 -5.38687,14.82601 -8.18104,20.50104 -2.79419,5.67501 -7.64271,14.05839 -10.77448,18.62971 -3.13178,4.57132 -9.10633,12.11081 -13.27676,16.75444 -4.17045,4.64364 -12.40091,12.21847 -18.28992,16.83296 -5.88901,4.61451 -15.53733,10.99562 -21.44069,14.18023 -5.90338,3.18462 -15.73944,7.53716 -21.8579,9.67228 -6.11847,2.13512 -16.11243,4.78805 -22.20881,5.89538 -13.76317,2.49991 -41.47336,2.46144 -54.96515,-0.0763 z m 95.95681,-34.54419 c 4.84748,-2.98012 11.90936,-7.88086 15.69306,-10.89052 9.51274,-7.5667 22.9262,-22.65624 27.77856,-31.24963 2.2286,-3.94679 5.30879,-9.3466 6.84486,-11.9996 3.49738,-6.0404 8.26443,-19.14099 10.98415,-30.18613 1.14496,-4.6498 2.3724,-15.185 2.72766,-23.41156 0.47109,-10.90872 0.0836,-18.06479 -1.43178,-26.43737 -1.14274,-6.31401 -3.75449,-16.30674 -5.8039,-22.20607 -2.04939,-5.89934 -6.17923,-15.072922 -9.17742,-20.385742 -2.99817,-5.31282 -8.76002,-13.75669 -12.80407,-18.76417 -4.04408,-5.00747 -11.91062,-12.91922 -17.48121,-17.58167 -5.57059,-4.66246 -15.10386,-11.18977 -21.18507,-14.50516 -6.0812,-3.31537 -16.39496,-7.78029 -22.91947,-9.92203 -6.52451,-2.14175 -17.09287,-4.62781 -23.48523,-5.5246 -15.66988,-2.19833 -36.24257,-0.92992 -51.7837,3.19271 -6.71499,1.78131 -17.46036,5.82975 -23.8786,8.99654 -6.41823,3.16679 -15.183985,8.24369 -19.479452,11.282 -4.29547,3.03832 -11.892389,9.56341 -16.882046,14.5002 -4.989657,4.93681 -11.871045,13.20489 -15.291972,18.37351 -3.420927,5.16863 -8.254042,13.61841 -10.740253,18.777312 -2.486214,5.1589 -5.979551,14.52352 -7.762975,20.81027 -2.469225,8.70428 -3.404826,15.48348 -3.922826,28.42407 -0.65147,16.27502 0.295164,26.82296 3.467979,38.64214 0.725043,2.70089 1.767851,4.62129 2.317351,4.26755 0.549502,-0.35373 1.392334,-6.06899 1.872964,-12.70056 1.190411,-16.42492 6.155827,-46.05672 10.044947,-59.9446 1.762181,-6.29266 4.82574,-14.77934 6.807909,-18.8593 1.982169,-4.079952 5.732589,-9.694472 8.334265,-12.476692 2.601677,-2.78222 7.577332,-6.41018 11.057011,-8.06215 3.90144,-1.85219 12.070798,-3.809 21.311209,-5.1047 20.984849,-2.94249 33.033109,-5.449 44.795139,-9.31916 9.92991,-3.26731 10.32965,-3.29583 18.93362,-1.35105 4.83424,1.0927 13.35945,3.82237 18.94491,6.06593 5.58545,2.24356 13.99331,7.03655 18.6841,10.65107 4.69079,3.61453 9.93351,7.32393 11.65049,8.24313 1.71697,0.91919 4.95268,2.08197 7.19047,2.58395 2.23778,0.50198 4.62594,1.99721 5.30702,3.32274 0.68107,1.32554 1.23832,3.891442 1.23832,5.702012 0,1.81056 1.63028,5.96953 3.62285,9.24215 3.21856,5.28622 4.73947,10.04311 10.08948,31.55662 0.92947,3.73762 4.04159,8.72905 9.52741,15.28064 4.48088,5.35142 10.74764,11.59353 13.92613,13.87134 3.17848,2.2778 10.30492,5.83438 15.83652,7.9035 l 10.05747,3.76204 -7.71646,-0.71854 c -4.24405,-0.3952 -10.56564,-1.84618 -14.04798,-3.22439 -4.67209,-1.84908 -6.33154,-2.07443 -6.33154,-0.85974 0,0.90535 1.74283,5.6497 3.87296,10.54298 2.13014,4.89327 4.38109,10.38816 5.00212,12.21084 0.96638,2.8362 0.90309,2.99055 -0.439,1.07068 -0.8625,-1.2338 -3.41486,-5.637 -5.67192,-9.78491 -2.25707,-4.14788 -9.19573,-13.6736 -15.41923,-21.16827 -6.22352,-7.49466 -12.86479,-16.84574 -14.7584,-20.78018 -1.89359,-3.93445 -4.63511,-11.25056 -6.09226,-16.25804 -1.45714,-5.00747 -3.96487,-10.79642 -5.57274,-12.86432 l -2.92338,-3.75984 -7.71296,2.78024 c -4.24214,1.52914 -13.61474,4.23274 -20.82802,6.00801 -7.21327,1.77528 -15.50448,4.48222 -18.4249,6.01543 -7.94513,4.17117 -19.55264,13.14845 -26.16757,20.23806 -7.01295,7.51618 -11.57143,17.33819 -10.36686,22.33714 0.45791,1.90038 2.63917,5.79906 4.84724,8.66374 2.20805,2.86468 6.79857,10.37507 10.20113,16.68975 3.40258,6.31467 9.43687,15.20572 13.40954,19.75788 3.97268,4.55215 11.5586,11.46227 16.85758,15.35582 5.299,3.89355 16.92011,14.17072 25.82468,22.83815 8.90456,8.66743 16.73876,15.75898 17.4093,15.75898 0.67056,0 5.18531,-2.43829 10.03279,-5.41843 z M 161.46447,98.864488 c 1.7617,-0.69765 3.20307,-2.09825 3.20307,-3.11245 0,-1.0142 -0.88883,-2.19927 -1.97519,-2.63348 -2.53984,-1.01516 -8.49431,-1.01516 -11.03414,0 -1.08636,0.43421 -1.97519,1.5757 -1.97519,2.53666 0,2.02856 3.43173,4.380972 6.47443,4.438172 1.15718,0.0218 3.54534,-0.531252 5.30702,-1.228902 z"
+       style="fill:#159677;fill-opacity:1;stroke:#159677;stroke-width:1.00678515;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.65116278" />
+  </g>
 </svg>
diff --git a/browser/branding/official/content/silhouette-40.svg b/browser/branding/official/content/silhouette-40.svg
index 5a41a1c3f2..c00a38cb1a 100644
--- a/browser/branding/official/content/silhouette-40.svg
+++ b/browser/branding/official/content/silhouette-40.svg
@@ -1,26 +1,58 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- 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 xmlns="http://www.w3.org/2000/svg" viewBox="-45 31 40 40">

-  <path fill="#ccc" d="M-14.1,54.7c0.7-1.4,1.7-4.4,0.8-6.9c0,0,0,0,0,0.1l0,0c0,0-0.2,0.5-0.4,1.3c0-0.1,0-0.2,0-0.3

-  c0.1-0.9,0-1.9-0.1-2.9c-0.3-1.5-1.4-2.8-2-3.2c0,0,0.1,0,0.1,0.1c-0.1-0.1-0.1-0.1-0.1-0.1s0,0.1,0.1,0.4c-0.7-1.1-1.6-1.5-1.6-1.5

-  s0,0.2,0.1,0.5c-2-1.9-4.7-3-7.6-3c-3,0-5.7,1.2-7.8,3.1c0.1,0.1,0.2,0.3,0.4,0.5c0,0,0.8-0.1,1.7-0.1c1.7-1.2,3.6-1.8,5.7-1.8

-  c2.6,0,5.1,1.1,7,3c-0.2-0.1-0.1,0,0,0.1c-0.6-0.4-1.2-0.8-1.7-0.8c1,0.8,2.6,2.7,2.4,6.2c-0.3-0.6-0.6-1-0.9-1.3

-  c0.4,3.5,0,4.2-0.2,5.1c0-0.4-0.2-0.7-0.3-0.9c0,0,0,1.1-0.7,2.6c-0.5,1.2-1.1,1.5-1.3,1.5c-0.2,0-0.1-0.2-0.1-0.4

-  c0,0-0.4,0.2-0.7,0.6c-0.3,0.4-0.6,0.8-0.8,0.6c0.1-0.1,0.2-0.3,0.3-0.4c-0.1,0.1-0.5,0.4-1.2,0.5c-0.3,0-1.6,0.3-3.3-0.6

-  c0.3,0,0.6-0.1,0.9,0.1c-0.3-0.3-1-0.3-1.5-0.4c-0.5-0.4-1.1-1-1.4-1.4c1.3,0.3,2.8,0.1,3.6-0.5s1.3-1,1.8-0.9

-  c0.4,0.1,0.7-0.4,0.4-0.8c-0.3-0.4-1.2-1-2.3-0.7c-0.8,0.2-1.8,1.1-3.3,0.2c-1.3-0.8-1.3-1.4-1.3-1.8c0-0.3,0.2-0.7,0.5-0.8

-  c0.2,0.1,0.3,0.1,0.3,0.1s-0.1-0.1-0.1-0.2l0,0c0.1,0,0.4,0.2,0.6,0.2c0.2,0.1,0.3,0.2,0.3,0.2s0,0,0-0.1c0,0-0.1-0.2-0.3-0.3l0,0

-  c0.1,0,0.2,0.1,0.4,0.2c0-0.2,0.1-0.4,0.1-0.7c0-0.2,0-0.3-0.1-0.4c-0.1-0.1,0-0.1,0.1,0c0-0.1,0-0.1-0.1-0.2l0,0c0,0,0,0,0-0.1

-  c0.2-0.3,1.8-1.2,1.9-1.3c0.2-0.1,0.3-0.3,0.4-0.5c0.2-0.1,0.3-0.5,0.3-0.8c0-0.1-0.2-0.3-0.4-0.3c-0.1,0-0.4-0.1-0.6,0l0,0

-  c-0.3,0-0.7,0-1.2,0s-0.8-0.3-1-0.6c0-0.1-0.1-0.1-0.1-0.2c0-0.1-0.1-0.2-0.1-0.2c0.2-0.8,0.7-1.5,1.4-2.1c0,0-0.2,0-0.1,0

-  c0,0,0.3-0.2,0.4-0.2c0.1,0-0.3-0.1-0.6-0.1c-0.5,0.2-0.6,0.2-0.8,0.3c0.1-0.1,0.3-0.2,0.2-0.2c-0.3,0.1-0.7,0.4-1.1,0.6v-0.1

-  c-0.2,0.1-0.6,0.4-0.7,0.7c0-0.1,0-0.1,0-0.1c-0.1,0-0.2,0.2-0.3,0.3l0,0c-1.1-0.3-2-0.2-2.8,0c-0.2-0.1-0.6-0.5-0.9-1

-  c0,0,0,0.1-0.1,0.1c-0.1-0.4-0.3-0.9-0.3-1.3v-0.1c0,0-0.1,0.1-0.3,0.3c-0.1,0.2-0.2,0.3-0.2,0.5c0,0.1-0.1,0.2-0.1,0.2v-0.2

-  c0,0.1-0.1,0.2-0.2,0.3c0,0.2,0,0.3-0.1,0.4l0,0c0,0,0-0.2,0-0.1c-0.1,0.2-0.2,0.5-0.2,0.8c-0.1,0.3-0.1,0.5-0.1,0.8s0,0.7,0,1.2

-  c0,0.1,0,0.1,0,0.2c-0.3,0.4-0.5,0.7-0.6,0.9c-0.4,0.7-0.7,1.8-1,3.5c0,0,0.2-0.6,0.6-1.3l0,0c-0.3,0.9-0.5,2.3-0.4,4.4

-  c0-0.1,0.1-0.6,0.2-1.3c0.1,1.4,0.5,3.1,1.5,5c0.8,1.4,1.7,2.4,2.7,3.2c0.2,0.2,0.4,0.3,0.6,0.5c1.3,1,3.3,2.1,5,2.4

-  c-0.6-0.2-1-0.5-1-0.5s2,0.7,3.5,0.6c-0.5-0.1-0.6-0.3-0.6-0.3s4.2,0.2,6.4-1.5c0.5-0.4,0.8-0.8,0.9-1.2c0.6-0.4,1.3-0.8,2-1.6

-  c1.2-1.2,1.3-2.1,1.4-3v0.1C-14,55.2-14,54.9-14.1,54.7z"/>

-</svg>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- 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
+   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"
+   viewBox="-45 31 40 40"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   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="1365"
+     inkscape:window-height="882"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="5.9"
+     inkscape:cx="20"
+     inkscape:cy="20"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <path
+     style="fill:#cdcdcd;fill-opacity:1;stroke:none;stroke-width:0.09873105;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.65116278"
+     d="m -27.647643,65.562283 c -0.532266,-0.100118 -1.463783,-0.355128 -2.070039,-0.566689 -0.606256,-0.211562 -1.59879,-0.651757 -2.205632,-0.978215 -0.606843,-0.326455 -1.521343,-0.917997 -2.032223,-1.314534 -0.510881,-0.39654 -1.342893,-1.175053 -1.848918,-1.730035 -0.506024,-0.554979 -1.183065,-1.42169 -1.504535,-1.926023 -0.32147,-0.504334 -0.802448,-1.401422 -1.068839,-1.993528 -0.266391,-0.592105 -0.635808,-1.643085 -0.820925,-2.335512 -0.312771,-1.169907 -0.336206,-1.425857 -0.331321,-3.618599 0.0048,-2.138674 0.0354,-2.475573 0.327132,-3.597604 0.177031,-0.680878 0.544081,-1.731858 0.815668,-2.335512 0.271586,-0.603654 0.747835,-1.495577 1.05833,-1.982051 0.310495,-0.486475 0.977642,-1.341898 1.48255,-1.900939 0.504907,-0.559041 1.332191,-1.341122 1.838407,-1.737956 0.506217,-0.396836 1.425343,-0.998095 2.042503,-1.336133 0.617159,-0.33804 1.618054,-0.785335 2.224208,-0.993992 0.606156,-0.208656 1.621533,-0.470387 2.256394,-0.581623 0.634861,-0.111237 1.796132,-0.202248 2.580602,-0.202248 0.78447,0 1.944288,0.09268 2.577375,0.205948 2.101951,0.376082 4.03914,1.17726 5.80404,2.400423 0.550767,0.381708 1.398178,1.076656 1.883139,1.544328 0.484961,0.467673 1.23565,1.341474 1.668201,1.941782 0.432548,0.600307 1.033197,1.613108 1.334776,2.250669 0.301577,0.63756 0.665075,1.55833 0.807773,2.046154 0.394436,1.348408 0.619365,2.902287 0.619365,4.278754 0,0.683137 -0.08218,1.732921 -0.182621,2.332852 -0.100442,0.599932 -0.319456,1.540146 -0.486697,2.089368 -0.167241,0.549221 -0.528267,1.453922 -0.802279,2.010448 -0.274014,0.556523 -0.749488,1.378645 -1.056607,1.826935 -0.30712,0.448289 -0.893018,1.187654 -1.301994,1.643035 -0.408978,0.455381 -1.216104,1.198212 -1.793613,1.650735 -0.57751,0.452525 -1.523679,1.078293 -2.102596,1.390594 -0.578918,0.312302 -1.543498,0.739136 -2.143509,0.948518 -0.600012,0.209382 -1.580076,0.469544 -2.177922,0.578135 -1.349694,0.245155 -4.067112,0.241382 -5.390193,-0.0075 z m 9.410068,-3.387599 c 0.475371,-0.292247 1.167899,-0.772841 1.53895,-1.067986 0.932873,-0.742033 2.248273,-2.221799 2.724123,-3.064515 0.218549,-0.387045 0.52061,-0.916581 0.671245,-1.176749 0.342973,-0.592356 0.810457,-1.877074 1.077168,-2.960223 0.112282,-0.455985 0.232651,-1.489127 0.26749,-2.29587 0.0462,-1.069771 0.0082,-1.771535 -0.140408,-2.592598 -0.112064,-0.619187 -0.368187,-1.599131 -0.569164,-2.177653 -0.200974,-0.578522 -0.60597,-1.478136 -0.899989,-1.999141 -0.294018,-0.521005 -0.859058,-1.349059 -1.25564,-1.840121 -0.396585,-0.491061 -1.168023,-1.266932 -1.714306,-1.724158 -0.546284,-0.457227 -1.48117,-1.097332 -2.077528,-1.422458 -0.596357,-0.325124 -1.607783,-0.762979 -2.247613,-0.97301 -0.639831,-0.210032 -1.676224,-0.45383 -2.303095,-0.541774 -1.536677,-0.215581 -3.554151,-0.09119 -5.078202,0.313095 -0.65851,0.174686 -1.712262,0.571699 -2.341671,0.882252 -0.629408,0.310553 -1.489028,0.808423 -1.910265,1.106377 -0.421239,0.297955 -1.166235,0.937842 -1.655549,1.421971 -0.489314,0.484132 -1.164142,1.294947 -1.499618,1.801811 -0.335475,0.506865 -0.809438,1.335498 -1.05325,1.841409 -0.243812,0.505911 -0.586388,1.424259 -0.761281,2.040773 -0.242146,0.853591 -0.333897,1.518398 -0.384695,2.787425 -0.06389,1.596021 0.02895,2.630412 0.34009,3.789467 0.0711,0.264865 0.173366,0.45319 0.227253,0.4185 0.05389,-0.03469 0.13654,-0.595159 0.183673,-1.245488 0.116739,-1.610721 0.603675,-4.516583 0.985064,-5.878507 0.17281,-0.617094 0.47324,-1.449346 0.667623,-1.84945 0.194382,-0.400103 0.56217,-0.950695 0.817305,-1.223535 0.255135,-0.27284 0.743076,-0.628618 1.084313,-0.79062 0.382597,-0.181636 1.183731,-0.373532 2.089898,-0.500596 2.057893,-0.288557 3.239413,-0.534359 4.392864,-0.913889 0.973784,-0.320411 1.012984,-0.323208 1.856738,-0.132492 0.474073,0.107156 1.310104,0.374843 1.857846,0.59486 0.54774,0.220016 1.372263,0.690043 1.832268,1.044504 0.460006,0.354461 0.974136,0.718226 1.142513,0.808368 0.168376,0.09014 0.485688,0.20417 0.705138,0.253397 0.21945,0.04923 0.453646,0.195857 0.520437,0.325846 0.06679,0.12999 0.121436,0.381617 0.121436,0.559172 0,0.177554 0.159875,0.585406 0.355278,0.906337 0.31563,0.518397 0.464779,0.984885 0.989431,3.094621 0.09115,0.366532 0.396341,0.85602 0.934312,1.498506 0.43942,0.524791 1.053974,1.136927 1.365675,1.360302 0.3117,0.223374 1.010559,0.572153 1.553019,0.775062 l 0.986292,0.368927 -0.75672,-0.07046 c -0.416195,-0.03876 -1.036126,-0.181047 -1.377624,-0.316202 -0.458172,-0.181331 -0.620907,-0.20343 -0.620907,-0.08431 0,0.08878 0.170912,0.554042 0.379805,1.033904 0.208893,0.479862 0.429634,1.018722 0.490536,1.197465 0.09477,0.278133 0.08856,0.29327 -0.04305,0.104996 -0.08458,-0.120993 -0.33488,-0.552796 -0.55622,-0.959563 -0.221342,-0.406765 -0.901786,-1.340911 -1.512097,-2.075881 -0.610314,-0.734968 -1.261595,-1.651988 -1.447293,-2.037822 -0.185696,-0.385834 -0.454545,-1.103293 -0.597441,-1.594355 -0.142896,-0.491061 -0.388818,-1.058758 -0.546495,-1.261548 l -0.286683,-0.368711 -0.756376,0.272646 c -0.416009,0.149956 -1.335139,0.415086 -2.042514,0.589179 -0.707374,0.174094 -1.520457,0.439552 -1.80685,0.589907 -0.779144,0.409049 -1.917442,1.289412 -2.56614,1.984659 -0.687729,0.737079 -1.13476,1.700281 -1.016633,2.190506 0.0449,0.186362 0.258812,0.568689 0.475348,0.849616 0.216534,0.280927 0.666706,1.017438 1.000381,1.636691 0.333676,0.619252 0.925432,1.491159 1.315015,1.93757 0.389583,0.446409 1.133502,1.124055 1.65315,1.505878 0.51965,0.381824 1.659281,1.389661 2.532514,2.239639 0.873231,0.849977 1.641497,1.545414 1.707254,1.545414 0.06576,0 0.508501,-0.239112 0.983873,-0.531362 z m -6.123628,-16.684506 c 0.172762,-0.06842 0.314111,-0.205766 0.314111,-0.305224 0,-0.09946 -0.08716,-0.215673 -0.193698,-0.258254 -0.249071,-0.09955 -0.833,-0.09955 -1.082071,0 -0.106534,0.04258 -0.193698,0.154522 -0.193698,0.248759 0,0.198932 0.336535,0.429623 0.634919,0.435232 0.11348,0.0021 0.347677,-0.0521 0.520437,-0.120513 z"
+     id="path4158"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="csssssssssssssssssssssssssssssssssccssssssssssssssssssssssscssssssssssssssssssscssssssssssscssssssssssssssssscs" />
+</svg>
diff --git a/browser/branding/official/default16.png b/browser/branding/official/default16.png
index 33ebba13ba..6618c06677 100644
--- a/browser/branding/official/default16.png
+++ b/browser/branding/official/default16.png
diff --git a/browser/branding/official/default22.png b/browser/branding/official/default22.png
index 2390f0924d..d53d5b5039 100644
--- a/browser/branding/official/default22.png
+++ b/browser/branding/official/default22.png
diff --git a/browser/branding/official/default24.png b/browser/branding/official/default24.png
index 737466b5ae..1e86c0cdd4 100644
--- a/browser/branding/official/default24.png
+++ b/browser/branding/official/default24.png
diff --git a/browser/branding/official/default256.png b/browser/branding/official/default256.png
index eef767dabc..96f72ae158 100644
--- a/browser/branding/official/default256.png
+++ b/browser/branding/official/default256.png
diff --git a/browser/branding/official/default32.png b/browser/branding/official/default32.png
index e9d5bbb4b2..ac39ccf0d6 100644
--- a/browser/branding/official/default32.png
+++ b/browser/branding/official/default32.png
diff --git a/browser/branding/official/default48.png b/browser/branding/official/default48.png
index 10de891724..e7dcd8ae2c 100644
--- a/browser/branding/official/default48.png
+++ b/browser/branding/official/default48.png
diff --git a/browser/branding/official/default64.png b/browser/branding/official/default64.png
new file mode 100644
index 0000000000..7bad34f8b2
--- /dev/null
+++ b/browser/branding/official/default64.png
diff --git a/browser/branding/official/document.ico b/browser/branding/official/document.ico
index 0957f61e3c..525b1a9297 100644
--- a/browser/branding/official/document.ico
+++ b/browser/branding/official/document.ico
diff --git a/browser/branding/official/firefox.ico b/browser/branding/official/firefox.ico
index 85ffedfe61..320796dd25 100644
--- a/browser/branding/official/firefox.ico
+++ b/browser/branding/official/firefox.ico
diff --git a/browser/branding/official/locales/en-US/brand.dtd b/browser/branding/official/locales/en-US/brand.dtd
index bb912cf056..7bfa07f718 100644
--- a/browser/branding/official/locales/en-US/brand.dtd
+++ b/browser/branding/official/locales/en-US/brand.dtd
@@ -2,8 +2,8 @@
    - 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/. -->
 
-<!ENTITY  brandShorterName      "Firefox">
-<!ENTITY  brandShortName        "Firefox">
-<!ENTITY  brandFullName         "Mozilla Firefox">
-<!ENTITY  vendorShortName       "Mozilla">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  brandShorterName      "Basilisk">
+<!ENTITY  brandShortName        "Basilisk">
+<!ENTITY  brandFullName         "Basilisk">
+<!ENTITY  vendorShortName       "Moonchild">
+<!ENTITY  trademarkInfo.part1   "Basilisk, Basilisk Browser and the Basilisk logos are trademarks of Moonchild Productions.">
diff --git a/browser/branding/official/locales/en-US/brand.properties b/browser/branding/official/locales/en-US/brand.properties
index b7b267fb37..9bdb667061 100644
--- a/browser/branding/official/locales/en-US/brand.properties
+++ b/browser/branding/official/locales/en-US/brand.properties
@@ -2,12 +2,12 @@
 # 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/.
 
-brandShorterName=Firefox
-brandShortName=Firefox
-brandFullName=Mozilla Firefox
-vendorShortName=Mozilla
+brandShorterName=Basilisk
+brandShortName=Basilisk
+brandFullName=Basilisk
+vendorShortName=Moonchild
 
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
+homePageSingleStartMain=Internal home page with search.
 homePageImport=Import your home page from %S
 
 homePageMigrationPageTitle=Home Page Selection
diff --git a/browser/branding/official/moz.build b/browser/branding/official/moz.build
index 9045cee11b..f1a839c9d4 100644
--- a/browser/branding/official/moz.build
+++ b/browser/branding/official/moz.build
@@ -9,5 +9,53 @@ DIRS += ['content', 'locales']
 DIST_SUBDIR = 'browser'
 export('DIST_SUBDIR')
 
-include('../branding-common.mozbuild')
-FirefoxBranding()
+JS_PREFERENCE_FILES += [
+    'pref/firefox-branding.js',
+]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    FINAL_TARGET_FILES['..'] += [
+        'basilisk.VisualElementsManifest.xml',
+    ]
+    FINAL_TARGET_FILES.VisualElements += [
+        'VisualElements_150.png',
+        'VisualElements_70.png',
+    ]
+    BRANDING_FILES += [
+        'appname.bmp',
+        'bgintro.bmp',
+        'branding.nsi',
+        'clock.bmp',
+        'document.ico',
+        'firefox.ico',
+        'newtab.ico',
+        'newwindow.ico',
+        'particles.bmp',
+        'pbmode.ico',
+        'pencil-rtl.bmp',
+        'pencil.bmp',
+        'wizHeader.bmp',
+        'wizHeaderRTL.bmp',
+        'wizWatermark.bmp',
+     ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    BRANDING_FILES += [
+        'background.png',
+        'disk.icns',
+        'document.icns',
+        'dsstore',
+        'firefox.icns',
+    ]
+elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+    BRANDING_FILES += [
+        'default16.png',
+        'default32.png',
+        'default48.png',
+        'mozicon128.png',
+    ]
+    FINAL_TARGET_FILES.icons += ['mozicon128.png']
+    FINAL_TARGET_FILES.chrome.icons.default += [
+        'default16.png',
+        'default32.png',
+        'default48.png',
+    ]
diff --git a/browser/branding/official/mozicon128.png b/browser/branding/official/mozicon128.png
index 946c31e688..0de78e0ceb 100644
--- a/browser/branding/official/mozicon128.png
+++ b/browser/branding/official/mozicon128.png
diff --git a/browser/branding/official/pref/firefox-branding.js b/browser/branding/official/pref/firefox-branding.js
index 35be873142..a3d6927bb4 100644
--- a/browser/branding/official/pref/firefox-branding.js
+++ b/browser/branding/official/pref/firefox-branding.js
@@ -2,11 +2,13 @@
  * 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/. */
 
-pref("startup.homepage_override_url", "");
-pref("startup.homepage_welcome_url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/firstrun/");
+pref("startup.homepage_override_url", "https://www.basilisk-browser.org/releasenotes.shtml");
+pref("startup.homepage_welcome_url", "http://www.basilisk-browser.org/firstrun/");
 pref("startup.homepage_welcome_url.additional", "");
+
+pref("app.update.url", "https://aus.basilisk-browser.org/?application=%PRODUCT%&version=%VERSION%&arch=%BUILD_TARGET%&buildid=%BUILD_ID%&channel=%CHANNEL%");
 // Interval: Time between checks for a new version (in seconds)
-pref("app.update.interval", 43200); // 12 hours
+pref("app.update.interval", 86400); // 1 day
 // The time interval between the downloading of mar file chunks in the
 // background (in seconds)
 // 0 means "download everything at once"
@@ -15,15 +17,23 @@ pref("app.update.download.backgroundInterval", 0);
 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", "https://www.mozilla.org/firefox/");
+pref("app.update.url.manual", "https://www.basilisk-browser.org/");
 // A default value for the "More information about this update" link
 // supplied in the "An update is available" page of the update wizard.
-pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/notes");
+pref("app.update.url.details", "https://www.basilisk-browser.org/releasenotes.shtml");
+
+// Switch Application Updates off for now
+pref("app.update.enabled", false);
+
+// Version release notes
+pref("app.releaseNotesURL", "http://www.basilisk-browser.org/releasenotes.shtml");
+// Vendor home page
+pref("app.vendorURL", "http://www.basilisk-browser.org/");
 
 // 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);
+pref("app.update.checkInstallTime.days", 14);
 
 // Give the user x seconds to reboot before showing a badge on the hamburger
 // button. default=immediately
@@ -31,6 +41,16 @@ pref("app.update.badgeWaitTime", 0);
 
 // 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
-pref("devtools.selfxss.count", 0);
+pref("devtools.selfxss.count", 100);
+
+// Disable Google Safebrowsing by default. Without an API key, this won't work.
+pref("browser.safebrowsing.phishing.enabled", false);
+pref("browser.safebrowsing.malware.enabled", false);
+pref("browser.safebrowsing.downloads.enabled", false);
+pref("browser.safebrowsing.downloads.remote.enabled", false);
+// Disable the UI controls for it as well for Basilisk-official.
+pref("browser.safebrowsing.UI.enabled", false);
+
+// FxA override
+pref("general.useragent.override.accounts.firefox.com", "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:55.0) Gecko/20100101 Goanna/4.0 Basilisk/55.0.0");
 
-pref("app.update.enabled", false);
diff --git a/browser/branding/official/wizHeader.bmp b/browser/branding/official/wizHeader.bmp
index 51bec2211a..8f1a0598bf 100644
--- a/browser/branding/official/wizHeader.bmp
+++ b/browser/branding/official/wizHeader.bmp
diff --git a/browser/branding/official/wizHeaderRTL.bmp b/browser/branding/official/wizHeaderRTL.bmp
index 7610fbfd05..8f1a0598bf 100644
--- a/browser/branding/official/wizHeaderRTL.bmp
+++ b/browser/branding/official/wizHeaderRTL.bmp
diff --git a/browser/branding/official/wizWatermark.bmp b/browser/branding/official/wizWatermark.bmp
index 5326bba930..491f27aa53 100644
--- a/browser/branding/official/wizWatermark.bmp
+++ b/browser/branding/official/wizWatermark.bmp
diff --git a/browser/config/version.txt b/browser/config/version.txt
index 4e9247c694..b406fbef67 100644
--- a/browser/config/version.txt
+++ b/browser/config/version.txt
@@ -1 +1 @@
-52.6.0
+55.0.0
diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt
index 4e9247c694..b406fbef67 100644
--- a/browser/config/version_display.txt
+++ b/browser/config/version_display.txt
@@ -1 +1 @@
-52.6.0
+55.0.0
diff --git a/browser/confvars.sh b/browser/confvars.sh
index 98fa4cbe9c..25692b1889 100755
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -3,8 +3,8 @@
 # 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/.
 
-MOZ_APP_BASENAME=Firefox
-MOZ_APP_VENDOR=Mozilla
+MOZ_APP_BASENAME=Basilisk
+MOZ_APP_VENDOR=Moonchild
 MOZ_PHOENIX=1
 MC_BASILISK=1
 MOZ_UPDATER=1
@@ -15,42 +15,38 @@ if test "$OS_ARCH" = "WINNT" -o \
 fi
 
 if test "$OS_ARCH" = "WINNT"; then
-  MOZ_MAINTENANCE_SERVICE=1
-  if ! test "$HAVE_64BIT_BUILD"; then
-    if test "$MOZ_UPDATE_CHANNEL" = "nightly" -o \
-            "$MOZ_UPDATE_CHANNEL" = "aurora" -o \
-            "$MOZ_UPDATE_CHANNEL" = "beta" -o \
-            "$MOZ_UPDATE_CHANNEL" = "beta-dev" -o \
-            "$MOZ_UPDATE_CHANNEL" = "release" -o \
-            "$MOZ_UPDATE_CHANNEL" = "release-dev"; then
-      if ! test "$MOZ_DEBUG"; then
-        MOZ_STUB_INSTALLER=1
-      fi
-    fi
-  fi
+  MOZ_MAINTENANCE_SERVICE=
 fi
 
-# Enable building ./signmar and running libmar signature tests
-MOZ_ENABLE_SIGNMAR=1
+# For Basilisk we want to use 55.0.YYYY.MM.DD as MOZ_APP_VERSION in release
+# builds so add-on developers have something to target while maintaining
+# Firefox compatiblity.
+# To enable add "export BASILISK_VERSION=1" to the .mozconfig file.
+# However, this will cause a full rebuild at 00:00 UTC every day so
+# don't export the variable if you are in development or don't care.
+# When not exported we fall back the value in the version*.txt file.
+if test -n "$BASILISK_VERSION" ; then
+    MOZ_APP_VERSION=55.0.`date --utc '+%Y.%m.%d'`
+    MOZ_APP_VERSION_DISPLAY=`date --utc '+%Y.%m.%d'`
+else
+    MOZ_APP_VERSION=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt`
+    MOZ_APP_VERSION_DISPLAY=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version_display.txt`
+fi
 
-MOZ_APP_VERSION=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt`
-MOZ_APP_VERSION_DISPLAY=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version_display.txt`
 MOZ_EXTENSIONS_DEFAULT=" gio"
+
 # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
 # MOZ_BRANDING_DIRECTORY is the default branding directory used when none is
 # specified. It should never point to the "official" branding directory.
-# For mozilla-beta, mozilla-release, or mozilla-central repositories, use
-# "unofficial" branding.
-# For the mozilla-aurora repository, use "aurora".
-MOZ_BRANDING_DIRECTORY=browser/branding/unofficial
-MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official
+MOZ_BRANDING_DIRECTORY=$MOZ_BUILD_APP/branding/unofficial
+MOZ_OFFICIAL_BRANDING_DIRECTORY=$MOZ_BUILD_APP/branding/official
 MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 # This should usually be the same as the value MAR_CHANNEL_ID.
 # If more than one ID is needed, then you should use a comma separated list
 # of values.
-ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-esr
+ACCEPTED_MAR_CHANNEL_IDS=basilisk-release
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
-MAR_CHANNEL_ID=firefox-mozilla-esr
+MAR_CHANNEL_ID=basilisk-release
 MOZ_PROFILE_MIGRATOR=1
 MOZ_APP_STATIC_INI=1
 MOZ_WEBGL_CONFORMANT=1
@@ -58,8 +54,9 @@ MOZ_JSDOWNLOADS=1
 MOZ_RUST_MP4PARSE=1
 MOZ_RUST_URLPARSE=1
 
-# Enable checking that add-ons are signed by the trusted root
-MOZ_ADDON_SIGNING=1
+# Disable checking that add-ons are signed by the trusted root
+MOZ_ADDON_SIGNING=0
+MOZ_REQUIRE_SIGNING=0
 
 # Include the DevTools client, not just the server (which is the default)
 MOZ_DEVTOOLS=all