diff --git a/helpers/DATA/thunderbird/branding/disk.icns b/helpers/DATA/thunderbird/branding/disk.icns
new file mode 100644
index 0000000..5e1d632
Binary files /dev/null and b/helpers/DATA/thunderbird/branding/disk.icns differ
diff --git a/helpers/DATA/thunderbird/branding/thunderbird.icns b/helpers/DATA/thunderbird/branding/thunderbird.icns
new file mode 100644
index 0000000..ccd6baf
Binary files /dev/null and b/helpers/DATA/thunderbird/branding/thunderbird.icns differ
diff --git a/helpers/DATA/thunderbird/debug_brand/debuglogo.svg b/helpers/DATA/thunderbird/debug_brand/debuglogo.svg
index ebe3c60..f93894a 100644
--- a/helpers/DATA/thunderbird/debug_brand/debuglogo.svg
+++ b/helpers/DATA/thunderbird/debug_brand/debuglogo.svg
@@ -1,22 +1,23 @@
+
diff --git a/helpers/DATA/thunderbird/debug_brand/debuglogo_gray.svg b/helpers/DATA/thunderbird/debug_brand/debuglogo_gray.svg
index d732c72..727f3d6 100644
--- a/helpers/DATA/thunderbird/debug_brand/debuglogo_gray.svg
+++ b/helpers/DATA/thunderbird/debug_brand/debuglogo_gray.svg
@@ -2,22 +2,22 @@
diff --git a/helpers/make-firefox b/helpers/make-firefox
index 5506f82..a8591d1 100644
--- a/helpers/make-firefox
+++ b/helpers/make-firefox
@@ -379,7 +379,7 @@ done
##Remove invalid policy for trisquel.
find -name aboutRights.ftl | xargs sed -i '/rights-intro-point-5/,$d'
find -name aboutRights.xhtml |xargs sed -i "/rights-intro-point-5/,/<\/li>/d"
-find -name aboutRights.xhtml |xargs sed -i "/rights-intro-point-6/d"
+find -name aboutRights.xhtml |xargs sed -i "/rights-intro-point-6/,/<\/li>/d"
find -name aboutRights-unbranded.xhtml |xargs sed -i "/rights-intro-point-5/,/<\/li>/d"
#EO about: mods.
@@ -430,6 +430,7 @@ cp -a $DATA/android/res/main/* mobile/android/geckoview/src/main/res
# Rebrand svg & debug tools & privacy logos
find devtools/client/themes/images/ -name aboutdebugging-firefox-*.svg | xargs -n1 cp $DATA/debug_brand/debuglogo.svg
find devtools/client/themes/images/ -name aboutdebugging-fenix*.svg | xargs -n1 cp $DATA/debug_brand/debuglogo.svg
+find devtools/client/themes/images/ -name aboutdebugging-firefox-logo.svg | xargs -n1 cp $DATA/debug_brand/debuglogo_gray.svg
find browser/branding/ -name about-logo.svg | xargs -n1 cp $DATA/debug_brand/debuglogo.svg
diff --git a/helpers/make-thunderbird b/helpers/make-thunderbird
index dbb55a5..9c76248 100644
--- a/helpers/make-thunderbird
+++ b/helpers/make-thunderbird
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (C) 2022 Luis Guzmán
+# Copyright (C) 2023 Luis Guzmán
# Copyright (C) 2020 Ruben Rodriguez
# Copyright (C) 2019 David Trudgian
#
@@ -19,7 +19,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=18
+VERSION=19
. ./config
@@ -179,6 +179,7 @@ s|www.mozilla.com/legal/privacy|trisquel.info/legal|g;
s/Trisquel Public/Mozilla Public/g;
s/Trisquel Foundation/Mozilla Foundation/g;
s/Trisquel Corporation/Mozilla Corporation/g;
+s|this-firefox|this-abrowser|g;
"
echo "Running batch replace operation"
find . -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -not -iregex '.*third_party/rust.*' -execdir /bin/sed --follow-symlinks -i "$SEDSCRIPT" '{}' ';'
@@ -251,25 +252,20 @@ do
find -name aboutRights.ftl | xargs sed -i "s/^$STRING.*/$STRING = /"
done
##Remove invalid policy for trisquel.
-find -name aboutRights.ftl | xargs sed -i '/rights-intro-point-5/,$d'
-find -name aboutRights.xhtml |xargs sed -i "/rights-intro-point-5/d"
-find -name aboutRights.xhtml |xargs sed -i "/rights-intro-point-6/d"
-find -name aboutRights-unbranded.xhtml |xargs sed -i "/rights-intro-point-5/d"
+find -name aboutRights.ftl | xargs sed -i '/rights-intro-point-3/,$d'
+find -name aboutRights.xhtml |xargs sed -i "/rights-intro-point-5/,/<\/li>/d"
+find -name aboutRights.xhtml |xargs sed -i "/rights-intro-point-6/,/<\/li>/d"
+find -name aboutRights-unbranded.xhtml |xargs sed -i "/rights-intro-point-5/,/<\/li>/d"
sed -i 's/Icedove\ Project<\/a>/Trisquel\ Project<\/a>/g' \
comm/mail/base/content/overrides/app-license.html
#EO about: mods.
-#Debbuging tools
-sed -i 's|this-firefox|this-abrowser|g' devtools/client/framework/test/browser_about-devtools-toolbox_reload.js
#Rebrand debug tools
-echo "devtools/client/themes/images/aboutdebugging-fenix.svg \
-devtools/client/themes/images/aboutdebugging-fenix-nightly.svg \
-devtools/client/themes/images/aboutdebugging-firefox-aurora.svg \
-devtools/client/themes/images/aboutdebugging-firefox-beta.svg \
-devtools/client/themes/images/aboutdebugging-firefox-nightly.svg \
-devtools/client/themes/images/aboutdebugging-firefox-release.svg" | xargs -n1 cp $DATA/debug_brand/debuglogo.svg
-cp $DATA/debug_brand/debuglogo_gray.svg devtools/client/themes/images/aboutdebugging-firefox-logo.svg
+find devtools/client/themes/images/ -name aboutdebugging-firefox-*.svg | xargs -n1 cp $DATA/debug_brand/debuglogo.svg
+find devtools/client/themes/images/ -name aboutdebugging-fenix*.svg | xargs -n1 cp $DATA/debug_brand/debuglogo.svg
+find devtools/client/themes/images/ -name aboutdebugging-firefox-logo.svg | xargs -n1 cp $DATA/debug_brand/debuglogo_gray.svg
+
cp $DATA/debug_brand/about-logo.svg comm/mail/branding/icedove/TB-symbolic.svg
cp $DATA/debug_brand/about-logo.svg comm/mail/themes/shared/mail/icons/aboutdebugging-logo.svg
cp $DATA/debug_brand/icon.png comm/mail/themes/icon.png