diff --git a/network/web/firefox/actions.py b/network/web/firefox/actions.py
index e5c48dceca..4b60ab8259 100644
--- a/network/web/firefox/actions.py
+++ b/network/web/firefox/actions.py
@@ -93,6 +93,9 @@ def install():
 
     # Install branding icon
     pisitools.insinto("/usr/share/pixmaps", "browser/branding/official/default256.png", "firefox.png")
+
+    for s in (16, 22, 24, 32, 48, 64, 128, 256):
+        pisitools.insinto("/usr/share/icons/hicolor/%dx%d/apps" % (s,s), "browser/branding/official/default%d.png" % s, "firefox.png")
     
     # Install docs
     pisitools.dodoc("README*", "LICENSE")
diff --git a/network/web/firefox/files/mozconfig-inst b/network/web/firefox/files/mozconfig-inst
index d017decd37..391755b5e4 100644
--- a/network/web/firefox/files/mozconfig-inst
+++ b/network/web/firefox/files/mozconfig-inst
@@ -21,9 +21,13 @@ export AR=llvm-ar
 export NM=llvm-nm
 export RANLIB=llvm-ranlib
 export LDFLAGS+=" -fuse-ld=lld"
-ac_add_options --allow-addon-sideload
+
+# Branding
 #ac_add_options --enable-official-branding
+ac_add_options --enable-update-channel=release
 ac_add_options --with-unsigned-addon-scopes=app,system
+ac_add_options --allow-addon-sideload
+export MOZILLA_OFFICIAL=1
 
 # System libraries
 ac_add_options --with-system-nspr
diff --git a/network/web/firefox/files/mozconfig-opt b/network/web/firefox/files/mozconfig-opt
index ac794e9fb9..aa86751007 100644
--- a/network/web/firefox/files/mozconfig-opt
+++ b/network/web/firefox/files/mozconfig-opt
@@ -21,9 +21,13 @@ export AR=llvm-ar
 export NM=llvm-nm
 export RANLIB=llvm-ranlib
 export LDFLAGS+=" -fuse-ld=lld"
-ac_add_options --allow-addon-sideload
-#ac_add_options --enable-official-branding
+
+# Branding
+ac_add_options --enable-official-branding
+ac_add_options --enable-update-channel=release
 ac_add_options --with-unsigned-addon-scopes=app,system
+ac_add_options --allow-addon-sideload
+export MOZILLA_OFFICIAL=1
 
 # System libraries
 ac_add_options --with-system-nspr
diff --git a/network/web/firefox/files/pisilinux/distribution.ini b/network/web/firefox/files/pisilinux/distribution.ini
index 36e45b5336..6a1e61630e 100755
--- a/network/web/firefox/files/pisilinux/distribution.ini
+++ b/network/web/firefox/files/pisilinux/distribution.ini
@@ -1,6 +1,6 @@
 [Global]
 id=PisiLinux
-version=2.2
+version=2.3
 about=Mozilla Firefox for PisiLinux
 
 [Preferences]
diff --git a/network/web/firefox/pspec.xml b/network/web/firefox/pspec.xml
index 3bb7e69219..dbb2508102 100644
--- a/network/web/firefox/pspec.xml
+++ b/network/web/firefox/pspec.xml
@@ -131,6 +131,7 @@
 <!--             <Path fileType="executable">/usr/lib</Path> -->
             <Path fileType="executable">/usr/lib/firefox</Path>
             <Path fileType="data">/usr/share/applications</Path>
+            <Path fileType="data">/usr/share/icons/hicolor</Path>
         </Files>
         <AdditionalFiles>
             <!-- Desktop file -->