Branding files updated for v52

27 files changed, 84 insertions, 202 deletions

diff --git a/data/branding/icecat/Makefile.in b/data/branding/icecat/Makefile.in
deleted file mode 100644
index d858c5b..0000000
--- a/data/branding/icecat/Makefile.in
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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/.
-
-include $(topsrcdir)/config/config.mk
-
-# On Windows only do this step for browser, skip for metro.
-ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows browser)
-BRANDING_FILES := \
-	icecat.ico \
-	document.ico \
-	branding.nsi \
-	appname.bmp \
-	bgintro.bmp \
-	clock.bmp \
-	particles.bmp \
-	pencil.bmp \
-	pencil-rtl.bmp \
-	wizHeader.bmp \
-	wizHeaderRTL.bmp \
-	wizWatermark.bmp \
-	newwindow.ico \
-	newtab.ico \
-	pbmode.ico \
-	$(NULL)
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-BRANDING_FILES := \
-	background.png \
-	icecat.icns \
-	disk.icns \
-	document.icns \
-	dsstore \
-	$(NULL)
-endif
-
-ifdef MOZ_WIDGET_GTK
-BRANDING_FILES := \
-	default16.png \
-	default32.png \
-	default48.png \
-	mozicon128.png \
-	$(NULL)
-endif
-
-BRANDING_DEST := $(DIST)/branding
-BRANDING_TARGET := export
-INSTALL_TARGETS += BRANDING
-
-ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
-VISUALMANIFEST := VisualElementsManifest.xml
-VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME}
-VISUALMANIFEST_PATH := $(DIST)/bin
-PP_TARGETS += VISUALMANIFEST
-endif
diff --git a/data/branding/icecat/VisualElementsManifest.xml b/data/branding/icecat/VisualElementsManifest.xml
deleted file mode 100644
index f763409..0000000
--- a/data/branding/icecat/VisualElementsManifest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Application
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <VisualElements
-      DisplayName="@MOZ_APP_DISPLAYNAME@"
-      Logo="tileresources\VisualElements_logo.png"
-      SmallLogo="tileresources\VisualElements_smalllogo.png"
-      ForegroundText="light"
-      BackgroundColor="#0a1833">
-    <DefaultTile
-        ShortName="@MOZ_APP_DISPLAYNAME@"
-        ShowName="allLogos"
-            />
-    <SplashScreen
-        Image="tileresources\VisualElements_splashscreen.png" />
-  </VisualElements>
-</Application>
diff --git a/data/branding/icecat/VisualElements_150.png b/data/branding/icecat/VisualElements_150.png
new file mode 100644
index 0000000..c32999a
--- /dev/null
+++ b/data/branding/icecat/VisualElements_150.png
diff --git a/data/branding/icecat/VisualElements_70.png b/data/branding/icecat/VisualElements_70.png
new file mode 100644
index 0000000..b504997
--- /dev/null
+++ b/data/branding/icecat/VisualElements_70.png
diff --git a/data/branding/icecat/content/Makefile.in b/data/branding/icecat/content/Makefile.in
deleted file mode 100644
index 2d17f36..0000000
--- a/data/branding/icecat/content/Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/.
-
-# Branding Makefile
-#  - jars chrome artwork
-
-# resources needed for the metro tile interface
-ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
-TILE_FILES := $(wildcard $(srcdir)/VisualElements*)
-TILE_DEST := $(DIST)/bin/tileresources
-INSTALL_TARGETS += TILE
-endif
diff --git a/data/branding/icecat/content/VisualElements_logo.png b/data/branding/icecat/content/VisualElements_logo.png
deleted file mode 100644
index 0cbf367..0000000
--- a/data/branding/icecat/content/VisualElements_logo.png
+++ /dev/null
diff --git a/data/branding/icecat/content/VisualElements_smalllogo.png b/data/branding/icecat/content/VisualElements_smalllogo.png
deleted file mode 100644
index 425f9fd..0000000
--- a/data/branding/icecat/content/VisualElements_smalllogo.png
+++ /dev/null
diff --git a/data/branding/icecat/content/VisualElements_splashscreen.png b/data/branding/icecat/content/VisualElements_splashscreen.png
deleted file mode 100644
index 484ac2f..0000000
--- a/data/branding/icecat/content/VisualElements_splashscreen.png
+++ /dev/null
diff --git a/data/branding/icecat/content/about-wordmark.svg b/data/branding/icecat/content/about-wordmark.svg
deleted file mode 100644
index 7c73566..0000000
--- a/data/branding/icecat/content/about-wordmark.svg
+++ /dev/null
@@ -1,78 +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"
-   id="aboutWordmark"
-   x="0px"
-   y="0px"
-   width="130px"
-   height="38px"
-   viewBox="0 0 130 38"
-   xml:space="preserve"
-   inkscape:version="0.48.3.1 r9886"
-   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="1678"
-   inkscape:window-height="980"
-   id="namedview5"
-   showgrid="false"
-   inkscape:zoom="12.361033"
-   inkscape:cx="65.19257"
-   inkscape:cy="11.28883"
-   inkscape:window-x="0"
-   inkscape:window-y="0"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="aboutWordmark" />
-
-  
-	
-
-
-<g
-   style="font-size:29.90496063px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Montserrat;-inkscape-font-specification:Montserrat"
-   id="text2985-3"><path
-     d="m 7.5040834,20.952038 c 0.99797,1.6e-5 1.8577666,0.138197 2.5793926,0.414545 0.721604,0.276379 1.435542,0.706277 2.141816,1.289696 l -1.174544,1.220605 c -1.0594042,-0.84443 -2.2262709,-1.266651 -3.500604,-1.266666 -1.3050564,1.5e-5 -2.4105091,0.537388 -3.3163613,1.61212 -0.9058618,1.059405 -1.3587904,2.694554 -1.3587869,4.905451 -3.5e-6,4.375758 1.4969637,6.563634 4.4909059,6.563632 1.1822123,2e-6 2.2108974,-0.253331 3.0860583,-0.759999 l 0,-4.951512 -2.8787857,0 -0.2303029,-1.63515 5.0896936,0 0,7.623025 c -1.550718,0.921211 -3.2856642,1.381817 -5.204845,1.381817 -2.0113175,0 -3.592729,-0.698585 -4.7442391,-2.095756 C 1.3319647,33.856678 0.75620807,31.814661 0.75620941,29.127789 0.75620807,26.563761 1.416409,24.560128 2.7368141,23.116885 4.0572125,21.673669 5.6463007,20.952054 7.5040834,20.952038"
-     style="font-size:23.03028679px;font-weight:normal;fill:#ffffff;-inkscape-font-specification:Fira Sans"
-     id="path2987" /><path
-     d="m 27.21585,21.228401 0,15.844837 -2.671513,0 -6.678783,-13.65696 c 0.184238,2.026677 0.276359,4.03031 0.276363,6.010905 l 0,7.646055 -1.865453,0 0,-15.844837 2.602422,0 6.724844,13.67999 c -0.1689,-1.596762 -0.253345,-3.201204 -0.253333,-4.81333 l 0,-8.86666 1.865453,0"
-     style="font-size:23.03028679px;font-weight:normal;fill:#ffffff;-inkscape-font-specification:Fira Sans"
-     id="path2989" /><path
-     d="m 42.660895,21.228401 0,10.801205 c -1.3e-5,1.59677 -0.483648,2.886464 -1.450908,3.869088 -0.951929,0.967272 -2.295361,1.450908 -4.0303,1.450908 -1.750307,0 -3.093739,-0.483636 -4.0303,-1.450908 -0.936568,-0.96727 -1.40485,-2.256965 -1.404848,-3.869088 l 0,-10.801205 1.980605,0 0,10.639993 c -4e-6,2.51798 1.151509,3.776968 3.454543,3.776967 2.303019,10e-7 3.454532,-1.258987 3.454543,-3.776967 l 0,-10.639993 2.026665,0"
-     style="font-size:23.03028679px;font-weight:normal;fill:#ffffff;-inkscape-font-specification:Fira Sans"
-     id="path2991" /><path
-     d="m 51.654545,16.349101 0,20.724137 -4.904413,0 0,-20.724137 4.904413,0"
-     style="font-weight:bold;fill:#ffffff;font-family:Fira Sans;-inkscape-font-specification:Fira Sans Bold"
-     id="path2993" /><path
-     d="m 62.358188,20.68532 c 2.093336,1.6e-5 3.907568,0.647956 5.442702,1.943822 l -2.063442,2.840972 c -0.95697,-0.777517 -1.953801,-1.166281 -2.990496,-1.166294 -2.133227,1.3e-5 -3.199837,1.644784 -3.199831,4.934319 -6e-6,1.674684 0.269139,2.860913 0.807434,3.55869 0.538282,0.697786 1.31581,1.046677 2.332587,1.046674 0.956949,3e-6 1.943812,-0.388761 2.960591,-1.166294 l 2.153157,3.020401 c -1.575007,1.256009 -3.359334,1.884012 -5.352988,1.884013 -2.432276,-10e-7 -4.35616,-0.747624 -5.771657,-2.242872 -1.395566,-1.515182 -2.093348,-3.538749 -2.093347,-6.070707 -10e-7,-2.55188 0.707749,-4.61532 2.123252,-6.190327 1.415497,-1.594916 3.299508,-2.392381 5.652038,-2.392397"
-     style="font-weight:bold;fill:#ffffff;font-family:Fira Sans;-inkscape-font-specification:Fira Sans Bold"
-     id="path2995" /><path
-     d="m 76.017276,20.68532 c 2.292703,1.6e-5 4.086999,0.717735 5.382893,2.153157 1.295867,1.435451 1.943807,3.429113 1.943823,5.980992 -1.6e-5,0.657917 -0.02992,1.226111 -0.08971,1.704583 l -9.808827,0 c 0.13955,1.33576 0.508378,2.272781 1.106483,2.811066 0.598092,0.538293 1.425462,0.807437 2.482112,0.807434 1.176251,3e-6 2.442226,-0.468507 3.79793,-1.405533 l 1.943822,2.631637 c -1.854121,1.475311 -3.917561,2.212966 -6.190327,2.212967 -2.571833,-10e-7 -4.545558,-0.757592 -5.921182,-2.272777 -1.37563,-1.515182 -2.063443,-3.548717 -2.063442,-6.100612 -10e-7,-2.472133 0.647939,-4.505669 1.943822,-6.100612 1.315814,-1.614853 3.140015,-2.422286 5.472608,-2.422302 m -2.601731,6.997761 5.293178,0 0,-0.209335 c -0.03989,-2.432258 -0.897159,-3.648392 -2.571827,-3.648405 -0.81741,1.3e-5 -1.445413,0.299062 -1.884012,0.897149 -0.438613,0.578174 -0.717725,1.565037 -0.837339,2.960591"
-     style="font-weight:bold;fill:#ffffff;font-family:Fira Sans;-inkscape-font-specification:Fira Sans Bold"
-     id="path2997" /><path
-     d="m 94.549005,15.840716 c 2.47213,2.2e-5 4.605349,0.757613 6.399665,2.272777 l -2.392401,2.840972 c -1.156338,-0.996815 -2.392409,-1.495231 -3.708215,-1.495248 -1.375637,1.7e-5 -2.472151,0.598116 -3.289546,1.794297 -0.797472,1.176277 -1.196204,2.980541 -1.196198,5.412798 -6e-6,2.412342 0.398726,4.206637 1.196198,5.382893 0.817395,1.156329 1.943814,1.734491 3.379261,1.734488 1.196187,3e-6 2.541908,-0.578159 4.03717,-1.734488 l 2.212971,2.870876 c -1.734507,1.774362 -3.89763,2.661541 -6.489381,2.661542 -2.89082,-10e-7 -5.1935,-0.94699 -6.908046,-2.840972 -1.714552,-1.913913 -2.571827,-4.605357 -2.571826,-8.074339 -10e-7,-3.389215 0.867242,-6.040786 2.601731,-7.954719 1.734483,-1.913898 3.977353,-2.870855 6.728617,-2.870877"
-     style="font-weight:bold;fill:#ffffff;font-family:Fira Sans;-inkscape-font-specification:Fira Sans Bold"
-     id="path2999" /><path
-     d="m 109.29869,20.68532 c 2.27277,1.6e-5 3.93748,0.468527 4.99413,1.405533 1.05663,0.937036 1.58495,2.342568 1.58496,4.2166 l 0,6.160421 c -1e-5,0.598104 0.0797,1.036709 0.23924,1.315819 0.17942,0.279116 0.45853,0.48845 0.83734,0.628004 l -0.98686,3.080211 c -0.97691,-0.07975 -1.77438,-0.289082 -2.3924,-0.628004 -0.59811,-0.338923 -1.07659,-0.88718 -1.43544,-1.644773 -1.03671,1.574995 -2.63164,2.362491 -4.78479,2.362492 -1.575,-10e-7 -2.83101,-0.458543 -3.76803,-1.375628 -0.93702,-0.917084 -1.40553,-2.113281 -1.40553,-3.588596 0,-1.734481 0.63797,-3.060267 1.91392,-3.97736 1.27594,-0.917076 3.12008,-1.375618 5.53242,-1.375628 l 1.61486,0 0,-0.687814 c -10e-6,-0.93701 -0.19937,-1.574982 -0.59809,-1.913917 -0.39875,-0.358847 -1.09653,-0.538277 -2.09335,-0.53829 -1.1364,1.3e-5 -2.52199,0.279126 -4.15679,0.837339 l -1.07658,-3.110116 c 2.09334,-0.777513 4.08701,-1.166277 5.98099,-1.166293 m 1.94382,9.180823 -1.16629,0 c -2.13323,7e-6 -3.19984,0.777535 -3.19983,2.332587 -1e-5,0.637977 0.15949,1.136392 0.47848,1.495248 0.33892,0.338926 0.79746,0.508387 1.37563,0.508384 1.05663,3e-6 1.89397,-0.498412 2.51201,-1.495248 l 0,-2.840971"
-     style="font-weight:bold;fill:#ffffff;font-family:Fira Sans;-inkscape-font-specification:Fira Sans Bold"
-     id="path3001" /><path
-     d="m 124.84414,17.216345 0,3.977359 3.6484,0 -0.50838,3.289546 -3.14002,0 0,7.29681 c -10e-6,0.737661 0.11961,1.265981 0.35886,1.584963 0.23923,0.31899 0.61802,0.478483 1.13639,0.47848 0.55821,3e-6 1.12641,-0.179427 1.70458,-0.53829 l 1.58496,3.020401 c -1.19621,0.837339 -2.63164,1.256008 -4.30631,1.256009 -3.46898,-0.01994 -5.20347,-1.933853 -5.20347,-5.741753 l 0,-7.35662 -2.24287,0 0,-3.289546 2.24287,0 0,-3.43907 4.72499,-0.538289"
-     style="font-weight:bold;fill:#ffffff;font-family:Fira Sans;-inkscape-font-specification:Fira Sans Bold"
-     id="path3003" /></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 f3f6491..46ba1b7 100644
--- a/data/branding/icecat/content/aboutDialog.css
+++ b/data/branding/icecat/content/aboutDialog.css
@@ -15,7 +15,7 @@
   min-width: 210px;
   min-height: 210px;
   margin-top: 20px;
-  -moz-margin-start: 30px;
+  margin-inline-start: 30px;
 }
 
 
@@ -28,7 +28,6 @@
 #rightBox {
   margin-left: 30px;
   margin-right: 30px;
- min-width: 300px;
 }
 
 #updateDeck > hbox > label:not([class="text-link"]) {
diff --git a/data/branding/icecat/content/identity-icons-brand.png b/data/branding/icecat/content/identity-icons-brand.png
deleted file mode 100644
index b26b76d..0000000
--- a/data/branding/icecat/content/identity-icons-brand.png
+++ /dev/null
diff --git a/data/branding/icecat/content/identity-icons-brand.svg b/data/branding/icecat/content/identity-icons-brand.svg
new file mode 100644
index 0000000..230938f
--- /dev/null
+++ b/data/branding/icecat/content/identity-icons-brand.svg
@@ -0,0 +1,59 @@
+<?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"
+   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="1364"
+     inkscape:window-height="700"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="16.536133"
+     inkscape:cx="8.4105593"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path2998"
+     d="M 10.951148,29.783395 C 6.0041912,28.052607 2.8478043,23.694361 2.8213489,18.557977 2.813379,17.013887 3.0442379,15.2354 3.3858943,14.208657 3.7037947,13.253336 4.2091896,11.377361 4.5089926,10.039846 5.3940592,6.0913781 7.7637452,3.2532194 11.198571,2.0278143 c 3.133484,-1.11790175 8.560002,-0.3045618 11.053342,1.6566951 0.844413,0.6642152 0.969857,0.681563 1.254245,0.1733913 0.278015,-0.4967863 0.499217,-0.4354921 1.840694,0.5100672 1.295743,0.9133227 1.815992,1.0679931 3.464506,1.0299871 1.066895,-0.024568 1.939807,0.080496 1.939807,0.2335455 0,0.1530484 -0.384522,0.7994342 -0.854492,1.4364882 -0.46997,0.6369894 -0.957593,1.8789082 -1.083609,2.7598102 -0.126018,0.8809021 -0.550076,1.9530651 -0.942357,2.3825691 -0.652213,0.714079 -0.678396,0.931861 -0.305997,2.545155 0.698616,3.026596 0.50768,5.627208 -0.675,9.193828 -1.202638,3.626833 -2.518018,5.413728 -4.441171,6.033122 -1.830266,0.58955 -9.629404,0.454463 -11.497391,-0.199078 z m 6.548285,-1.921005 -0.441809,-0.799837 -0.198668,1.042187 c -0.142363,0.746857 -0.04799,1.102593 0.332991,1.255342 0.70318,0.281839 0.862308,-0.493236 0.307486,-1.497692 z m 3.871891,1.483094 c 0,-0.321851 -0.958396,-1.414475 -1.240721,-1.414475 -0.08188,0 -0.148885,0.390861 -0.148885,0.868521 0,0.636925 0.18528,0.868522 0.694803,0.868522 0.382141,0 0.694803,-0.145188 0.694803,-0.322568 z m 2.176273,-0.579904 c 0.278309,-0.27832 -0.08594,-1.181966 -0.476434,-1.181966 -0.170629,0 -0.310233,0.312662 -0.310233,0.694855 0,0.677131 0.368477,0.905275 0.786667,0.487111 z m -8.292414,-0.690686 c 0.116283,-0.303018 0.08085,-0.784263 -0.07873,-1.069426 -0.238739,-0.426636 -0.38953,-0.366815 -0.850974,0.337425 -0.308453,0.470754 -0.464737,0.951999 -0.347302,1.069427 0.394834,0.394835 1.06385,0.218041 1.277011,-0.337426 z M 9.2409746,26.278355 C 5.5369651,22.574302 4.6050459,17.31508 7.2619841,15.110021 c 0.9877834,-0.819778 1.8985004,-0.06451 3.3976179,2.8167 3.250201,6.24732 5.878529,8.656411 9.479401,8.688799 1.982598,0.01759 3.23394,-0.535267 4.431084,-1.958475 0.986571,-1.172908 2.012261,-4.269688 2.012261,-6.075479 0,-2.785877 -0.34264,-3.867162 -1.346401,-4.24877 -2.41013,-0.916353 -3.281313,-1.521998 -3.728397,-2.592009 -0.68662,-1.643334 -1.173798,-1.7887826 -2.102708,-0.627931 -0.978288,1.222627 -1.087674,4.048841 -0.240834,6.222425 0.903835,2.319881 1.676476,5.336572 1.429947,5.583093 -0.452528,0.452571 -2.030625,-0.228795 -2.325341,-1.004001 -0.164409,-0.432436 -0.549706,-0.994355 -0.856217,-1.248694 -0.30651,-0.254405 -0.557292,-0.734999 -0.557292,-1.067992 0,-0.332929 -0.307022,-0.995725 -0.682271,-1.472734 -0.791469,-1.006215 -1.37447,-3.050967 -1.710899,-6.00067 -0.346807,-3.0407361 -0.780181,-3.6477491 -2.604252,-3.6477491 -1.670699,0 -3.4917526,1.101097 -5.2291758,3.1617471 -3.247523,3.851784 -3.1258517,10.058571 0.270974,13.823032 0.7590649,0.841219 3.6277548,2.817156 4.0900188,2.817156 0.138378,0 -0.64846,-0.900061 -1.7485254,-2.000114 z m 3.9387234,0.19719 c 0.723689,-1.033194 0.486012,-1.139218 -0.800386,-0.35691 -0.594077,0.361275 -0.976481,0.760544 -0.849785,0.887224 0.442597,0.442602 1.121532,0.224429 1.650171,-0.530314 z M 11.73093,24.871439 c 1.309741,-1.124816 0.31696,-1.537768 -1.092166,-0.454331 -0.472549,0.363295 -0.7246814,0.812413 -0.583948,1.0401 0.260362,0.421293 0.670285,0.278061 1.676114,-0.585769 z m -1.650157,-1.988515 c 0.573213,-0.469841 0.917193,-0.855032 0.764403,-0.85601 -0.547236,-0.0066 -2.3277091,1.065059 -2.3277091,1.396815 0,0.533052 0.438233,0.381411 1.5633061,-0.540805 z M 9.9070725,20.570277 c 0,-0.423509 -2.1877415,0.549016 -2.3534667,1.046227 -0.096736,0.290181 0.2594869,0.236353 1.1053682,-0.167018 0.6864535,-0.327326 1.2480985,-0.723008 1.2480985,-0.879209 z M 8.8648674,18.147631 c 0,-0.382194 -1.7101037,0.799968 -1.7260886,1.193239 -0.00601,0.14773 0.3799096,0.01238 0.8575867,-0.300542 0.4776759,-0.312988 0.8685019,-0.714666 0.8685019,-0.892697 z M 11.871624,6.7990523 c -0.316222,-0.3494161 -0.574945,-0.9139014 -0.574945,-1.254397 0,-0.5286661 0.104348,-0.4993023 0.714419,0.2010548 0.672066,0.7715027 0.692661,0.7751526 0.347401,0.061322 -0.599965,-1.2404384 -0.418509,-1.6353788 0.347403,-0.7561244 0.711943,0.817295 0.713091,0.8174048 0.331334,0.031279 -0.480131,-0.9886786 -0.140312,-1.6678564 0.548483,-1.0962098 0.269593,0.2237472 0.490172,0.5917932 0.490172,0.8178839 0,0.2260896 0.411768,0.9495144 0.91504,1.6076563 0.503272,0.6581026 0.804985,0.8839012 0.670474,0.5017068 C 15.526894,6.5310954 15.325755,5.7494248 15.21443,5.1762128 l -0.20241,-1.0422051 0.769049,0.6809889 c 0.655614,0.5805443 0.816381,0.6061658 1.089924,0.1737032 0.176482,-0.2790108 0.323266,-0.3335537 0.326193,-0.1212116 0.0031,0.2238337 0.370291,0.3163099 0.873822,0.2200544 0.558105,-0.106681 0.868506,-0.0082 0.868506,0.2757157 0,0.2950395 0.230741,0.2329252 0.694803,-0.1870455 0.394019,-0.3565832 0.694804,-0.4550876 0.694804,-0.2275426 0,0.2206874 0.390824,0.4012472 0.868503,0.4012472 1.408052,0 1.008916,-0.5000126 -1.266256,-1.5862831 C 16.182607,1.9738073 10.459269,2.4890814 8.5511691,4.7882074 8.0150589,5.4341764 8.3995171,6.3015845 8.9693642,5.731779 9.2357352,5.4654091 9.5280408,5.6310812 9.9886091,6.3094678 L 10.634374,7.2606845 10.444175,5.8710176 10.253977,4.4814083 10.810969,5.6973191 c 0.306343,0.6687776 0.736365,1.3307913 0.955602,1.4711572 0.670461,0.4293091 0.708103,0.2969569 0.105053,-0.3694217 z M 27.971952,6.7397513 C 28.3757,6.478831 28.270412,6.4018049 27.504451,6.3976351 c -0.543732,0 -1.449245,-0.2773948 -2.01225,-0.6099714 -0.896637,-0.529656 -1.064268,-0.5404292 -1.351037,-0.08686 -0.506788,0.8016103 -0.396848,1.1728546 0.200508,0.677079 0.444872,-0.3692253 0.639085,-0.3464118 1.116646,0.1311763 0.64377,0.6437672 1.721418,0.7426227 2.513634,0.2306844 z M 8.170064,6.2391479 C 8.170064,6.1548979 8.0137352,5.98933 7.8226635,5.871244 7.6315929,5.7531579 7.4752629,5.822108 7.4752629,6.0244403 c 0,0.202352 0.15633,0.3679166 0.3474006,0.3679166 0.1910717,0 0.3474005,-0.068945 0.3474005,-0.153209 z"
+     style="fill:#1861a9;fill-opacity:1" />
+</svg>
diff --git a/data/branding/icecat/content/identity-icons-brand@2x.png b/data/branding/icecat/content/identity-icons-brand@2x.png
deleted file mode 100644
index 41e9a1d..0000000
--- a/data/branding/icecat/content/identity-icons-brand@2x.png
+++ /dev/null
diff --git a/data/branding/icecat/content/jar.mn b/data/branding/icecat/content/jar.mn
index fec1857..4b8c5fc 100644
--- a/data/branding/icecat/content/jar.mn
+++ b/data/branding/icecat/content/jar.mn
@@ -4,24 +4,15 @@
 
 browser.jar:
 % content branding %content/branding/ contentaccessible=yes
-  content/branding/about.png                     (about.png)
-  content/branding/about-logo.png                (about-logo.png)
-  content/branding/about-logo@2x.png             (about-logo@2x.png)
-  content/branding/about-wordmark.png            (about-wordmark.png)
-  content/branding/icon48.png                    (icon48.png)
-  content/branding/icon64.png                    (icon64.png)
+  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/icon16.png                    (../default16.png)
   content/branding/icon32.png                    (../default32.png)
   content/branding/icon128.png                   (../mozicon128.png)
-  content/branding/identity-icons-brand.png      (identity-icons-brand.png)
-  content/branding/identity-icons-brand@2x.png   (identity-icons-brand@2x.png)
-  content/branding/silhouette-40.svg             (silhouette-40.svg)
-  content/branding/aboutDialog.css               (aboutDialog.css)
-#ifdef MOZ_METRO
-  content/branding/metro-about.css               (metro-about.css)
-  content/branding/metro-about-footer.png        (metro-about-footer.png)
-  content/branding/metro-about-wordmark.png      (metro-about-wordmark.png)
-  content/branding/metro_firstrun_logo.png       (metro_firstrun_logo.png)
-  content/branding/metro_firstrun_logo@1.4x.png  (metro_firstrun_logo@1.4x.png)
-  content/branding/metro_firstrun_logo@1.8x.png  (metro_firstrun_logo@1.8x.png)
-#endif
+  content/branding/identity-icons-brand.svg
+  content/branding/silhouette-40.svg
+  content/branding/aboutDialog.css
diff --git a/data/branding/icecat/content/metro-about-footer.png b/data/branding/icecat/content/metro-about-footer.png
deleted file mode 100644
index c81a520..0000000
--- a/data/branding/icecat/content/metro-about-footer.png
+++ /dev/null
diff --git a/data/branding/icecat/content/metro-about-wordmark.png b/data/branding/icecat/content/metro-about-wordmark.png
deleted file mode 100644
index 6870bb6..0000000
--- a/data/branding/icecat/content/metro-about-wordmark.png
+++ /dev/null
diff --git a/data/branding/icecat/content/metro-about.css b/data/branding/icecat/content/metro-about.css
deleted file mode 100644
index 70c5c73..0000000
--- a/data/branding/icecat/content/metro-about.css
+++ /dev/null
@@ -1,14 +0,0 @@
-/* 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/. */
-
-#about-flyoutpanel {
-  background-color: #0095dd;
-  color: white;
-}
-
-#about-policy-label:hover,
-#about-policy-label:active {
-  background: #036fa4;
-}
-
diff --git a/data/branding/icecat/content/metro_firstrun_logo.png b/data/branding/icecat/content/metro_firstrun_logo.png
deleted file mode 100644
index 8ad7f27..0000000
--- a/data/branding/icecat/content/metro_firstrun_logo.png
+++ /dev/null
diff --git a/data/branding/icecat/content/metro_firstrun_logo@1.4x.png b/data/branding/icecat/content/metro_firstrun_logo@1.4x.png
deleted file mode 100644
index 8a247a8..0000000
--- a/data/branding/icecat/content/metro_firstrun_logo@1.4x.png
+++ /dev/null
diff --git a/data/branding/icecat/content/metro_firstrun_logo@1.8x.png b/data/branding/icecat/content/metro_firstrun_logo@1.8x.png
deleted file mode 100644
index a716c58..0000000
--- a/data/branding/icecat/content/metro_firstrun_logo@1.8x.png
+++ /dev/null
diff --git a/data/branding/icecat/content/moz.build b/data/branding/icecat/content/moz.build
index c97072b..eb4454d 100644
--- a/data/branding/icecat/content/moz.build
+++ b/data/branding/icecat/content/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/icecat.VisualElementsManifest.xml b/data/branding/icecat/icecat.VisualElementsManifest.xml
new file mode 100644
index 0000000..d675d57
--- /dev/null
+++ b/data/branding/icecat/icecat.VisualElementsManifest.xml
@@ -0,0 +1,8 @@
+<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+  <VisualElements
+      ShowNameOnSquare150x150Logo='on'
+      Square150x150Logo='browser\VisualElements\VisualElements_150.png'
+      Square70x70Logo='browser\VisualElements\VisualElements_70.png'
+      ForegroundText='light'
+      BackgroundColor='#0996f8'/>
+</Application>
diff --git a/data/branding/icecat/moz.build b/data/branding/icecat/moz.build
index 408c1f0..e613901 100644
--- a/data/branding/icecat/moz.build
+++ b/data/branding/icecat/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
@@ -9,7 +9,6 @@ DIRS += ['content', 'locales']
 DIST_SUBDIR = 'browser'
 export('DIST_SUBDIR')
 
-JS_PREFERENCE_FILES += [
-    'pref/icecat-branding.js',
-]
+include('../branding-common.mozbuild')
+IceCatBranding()
 
diff --git a/data/branding/icecat/newtab.ico b/data/branding/icecat/newtab.ico
index 6e3fee6..a9b37c0 100644
--- a/data/branding/icecat/newtab.ico
+++ b/data/branding/icecat/newtab.ico
diff --git a/data/branding/icecat/newwindow.ico b/data/branding/icecat/newwindow.ico
index a300935..5537207 100644
--- a/data/branding/icecat/newwindow.ico
+++ b/data/branding/icecat/newwindow.ico
diff --git a/data/branding/icecat/pbmode.ico b/data/branding/icecat/pbmode.ico
index d217994..47677c1 100644
--- a/data/branding/icecat/pbmode.ico
+++ b/data/branding/icecat/pbmode.ico
diff --git a/data/branding/icecat/pref/icecat-branding.js b/data/branding/icecat/pref/icecat-branding.js
index 4c0eb17..84b9c63 100644
--- a/data/branding/icecat/pref/icecat-branding.js
+++ b/data/branding/icecat/pref/icecat-branding.js
@@ -27,3 +27,6 @@ pref("browser.search.param.yahoo-fr-cjkt", ""); // now unused
 pref("browser.search.param.yahoo-fr-ja", "");
 pref("browser.search.param.yahoo-f-CN", "");
 
+// 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);