diff --git a/helpers/DATA/firefox/newtab/directory.png b/helpers/DATA/firefox/newtab/directory.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fbaacd6af7db1f680f60136fae20786700b5e01
Binary files /dev/null and b/helpers/DATA/firefox/newtab/directory.png differ
diff --git a/helpers/DATA/firefox/newtab/fsf.ico b/helpers/DATA/firefox/newtab/fsf.ico
new file mode 100644
index 0000000000000000000000000000000000000000..1a616bdcbc046cf80e6a70a52bf0056509e66c41
Binary files /dev/null and b/helpers/DATA/firefox/newtab/fsf.ico differ
diff --git a/helpers/DATA/firefox/newtab/fsf.png b/helpers/DATA/firefox/newtab/fsf.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ff8aff22f9992c83fa5a76dce9c061a21c796d2
Binary files /dev/null and b/helpers/DATA/firefox/newtab/fsf.png differ
diff --git a/helpers/DATA/firefox/newtab/fsfe.ico b/helpers/DATA/firefox/newtab/fsfe.ico
new file mode 100644
index 0000000000000000000000000000000000000000..9127b92332dd120e3c9dba13a2e97d81ee9941c4
Binary files /dev/null and b/helpers/DATA/firefox/newtab/fsfe.ico differ
diff --git a/helpers/DATA/firefox/newtab/fsfe.png b/helpers/DATA/firefox/newtab/fsfe.png
new file mode 100644
index 0000000000000000000000000000000000000000..0127c582dab225401f29789adec89669853c0306
Binary files /dev/null and b/helpers/DATA/firefox/newtab/fsfe.png differ
diff --git a/helpers/DATA/firefox/newtab/gnu.ico b/helpers/DATA/firefox/newtab/gnu.ico
new file mode 100644
index 0000000000000000000000000000000000000000..3891a854dbe2ca2a5cc58d4c28a5f8ccb060f675
Binary files /dev/null and b/helpers/DATA/firefox/newtab/gnu.ico differ
diff --git a/helpers/DATA/firefox/newtab/gnu.png b/helpers/DATA/firefox/newtab/gnu.png
new file mode 100644
index 0000000000000000000000000000000000000000..0669539abefb72345fcf9858b7f26c27ded92bd8
Binary files /dev/null and b/helpers/DATA/firefox/newtab/gnu.png differ
diff --git a/helpers/DATA/firefox/newtab/libreplanet.ico b/helpers/DATA/firefox/newtab/libreplanet.ico
new file mode 100644
index 0000000000000000000000000000000000000000..c55e25e8107a2f8032ab8dce9468dc7444faac23
Binary files /dev/null and b/helpers/DATA/firefox/newtab/libreplanet.ico differ
diff --git a/helpers/DATA/firefox/newtab/libreplanet.png b/helpers/DATA/firefox/newtab/libreplanet.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b60e471a36147982ea52acf0619e620f364b990
Binary files /dev/null and b/helpers/DATA/firefox/newtab/libreplanet.png differ
diff --git a/helpers/DATA/firefox/newtab/trisquel.ico b/helpers/DATA/firefox/newtab/trisquel.ico
new file mode 100644
index 0000000000000000000000000000000000000000..0c0408c1c39beaca4904137b0e715491211b5b86
Binary files /dev/null and b/helpers/DATA/firefox/newtab/trisquel.ico differ
diff --git a/helpers/DATA/firefox/newtab/trisquel.png b/helpers/DATA/firefox/newtab/trisquel.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e5b00dde4bb65fc6a3e18d2ea2b7f8ed51bb8f3
Binary files /dev/null and b/helpers/DATA/firefox/newtab/trisquel.png differ
diff --git a/helpers/DATA/firefox/newtab/wikinews.ico b/helpers/DATA/firefox/newtab/wikinews.ico
new file mode 100644
index 0000000000000000000000000000000000000000..6c7ce5aee0a05577487132e22298d54245f4cb8f
Binary files /dev/null and b/helpers/DATA/firefox/newtab/wikinews.ico differ
diff --git a/helpers/DATA/firefox/newtab/wikinews.png b/helpers/DATA/firefox/newtab/wikinews.png
new file mode 100644
index 0000000000000000000000000000000000000000..93bde2cef1e82bc565482d7f4010dc93dd348dac
Binary files /dev/null and b/helpers/DATA/firefox/newtab/wikinews.png differ
diff --git a/helpers/DATA/firefox/newtab/wikipedia-org@2x.png b/helpers/DATA/firefox/newtab/wikipedia-org@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..506aa1affe84037ca8ddfdc9e4a213469003d814
Binary files /dev/null and b/helpers/DATA/firefox/newtab/wikipedia-org@2x.png differ
diff --git a/helpers/DATA/firefox/newtab/wikipedia.ico b/helpers/DATA/firefox/newtab/wikipedia.ico
new file mode 100644
index 0000000000000000000000000000000000000000..e70021849bdf154b79a9eb6fd1621e5c51571d40
Binary files /dev/null and b/helpers/DATA/firefox/newtab/wikipedia.ico differ
diff --git a/helpers/DATA/firefox/newtab/wikipedia.png b/helpers/DATA/firefox/newtab/wikipedia.png
new file mode 100644
index 0000000000000000000000000000000000000000..506aa1affe84037ca8ddfdc9e4a213469003d814
Binary files /dev/null and b/helpers/DATA/firefox/newtab/wikipedia.png differ
diff --git a/helpers/DATA/firefox/settings.js b/helpers/DATA/firefox/settings.js
index 481a8c2a5f4785ac6189ecc41285fea63f1c012c..0715c78cfb8d1f6f94ecc23d645853be73f9c4eb 100644
--- a/helpers/DATA/firefox/settings.js
+++ b/helpers/DATA/firefox/settings.js
@@ -232,7 +232,7 @@ pref("browser.onboarding.updatetour", "performance,library,singlesearch,customiz
pref("browser.onboarding.enabled", false);
// New tab settings
-pref("browser.newtabpage.activity-stream.default.sites", "https://trisquel.info/,https://www.gnu.org/,https://www.fsf.org/,https://libreplanet.org/,https://www.wikipedia.org/wiki/,https://www.wikinews.org/wiki/");
+pref("browser.newtabpage.activity-stream.default.sites", "https://trisquel.info/,https://www.gnu.org/,https://www.fsf.org/,https://directory.fsf.org,https://libreplanet.org/,https://fsfe.org,https://www.wikipedia.org/wiki/,https://www.wikinews.org/wiki/");
pref("browser.newtabpage.activity-stream.showTopSites",true);
pref("browser.newtabpage.activity-stream.feeds.section.topstories",false);
pref("browser.newtabpage.activity-stream.feeds.snippets",false);
diff --git a/helpers/make-firefox b/helpers/make-firefox
index fe7c6f6c5353d1002f31e4f39c8268963ed1a6d6..fe1828d3b7022a64d06b3c38534536712aa6ddf3 100644
--- a/helpers/make-firefox
+++ b/helpers/make-firefox
@@ -35,7 +35,7 @@ sed '/async download.*/areturn;' -i services/settings/RemoteSettingsClient.jsm s
# Disable activity-stream antifeatures.
# These are not condensed into a single sed script to make it fail on individual commands that didn't change the source
ActivityStream=browser/components/newtab/lib/ActivityStream.jsm
-sed '/^const DEFAULT_SITES/,/^])\;/c const DEFAULT_SITES = new Map\([[""]]\);' -i $ActivityStream
+sed '/^const DEFAULT_SITES/,/^])\;/c const DEFAULT_SITES = new Map\([[""]]\);' -i browser/components/newtab/lib/DefaultSites.jsm
sed '/"showSponsored"/,/value/s/value: true/value: false/' -i $ActivityStream
sed '/"telemetry"/,/value/s/value: true/value: false/' -i $ActivityStream
sed '/"section.highlights.includePocket"/,/value/s/value: true/value: false/' -i $ActivityStream
@@ -86,6 +86,65 @@ sed "s/iceweasel,/iceweasel, firefox,/" -i debian/control.in
sed -i /ubuntu-bookmarks/d debian/patches/series
rm debian/patches/ubuntu-bookmarks*
+# Custom newtab images
+sed '/^]$/d' -i browser/components/newtab/data/content/tippytop/top_sites.json
+sed 's/}$/},/' -i browser/components/newtab/data/content/tippytop/top_sites.json
+
+cat << EOF >> browser/components/newtab/data/content/tippytop/top_sites.json
+ {
+ "title": "Trisquel",
+ "url": "https://trisquel.info/",
+ "image_url": "images/trisquel.png",
+ "favicon_url": "favicons/trisquel.ico"
+ },
+ {
+ "title": "GNU",
+ "url": "https://www.gnu.org/",
+ "image_url": "images/gnu.png",
+ "favicon_url": "favicons/gnu.ico"
+ },
+ {
+ "title": "FSF",
+ "url": "https://www.fsf.org/",
+ "image_url": "images/fsf.png",
+ "favicon_url": "favicons/fsf.ico"
+ },
+ {
+ "title": "FSF Directory",
+ "url": "https://directory.fsf.org/",
+ "image_url": "images/fsf.png",
+ "favicon_url": "favicons/fsf.ico"
+ },
+ {
+ "title": "LibrePlanet",
+ "url": "https://libreplanet.org/",
+ "image_url": "images/libreplanet.png",
+ "favicon_url": "favicons/libreplanet.ico"
+ },
+ {
+ "title": "FSF Europe",
+ "url": "https://fsfe.org/",
+ "image_url": "images/fsfe.png",
+ "favicon_url": "favicons/fsfe.ico"
+ },
+ {
+ "title": "Wikipedia",
+ "url": "https://www.wikipedia.org/wiki/",
+ "image_url": "images/wikipedia.png",
+ "favicon_url": "favicons/wikipedia.ico"
+ },
+ {
+ "title": "Wikinews",
+ "url": "https://www.wikinews.org/wiki/",
+ "image_url": "images/wikinews.png",
+ "favicon_url": "favicons/wikinews.ico"
+ }
+]
+EOF
+
+cp $DATA/newtab/*.ico browser/components/newtab/data/content/tippytop/favicons/
+cp $DATA/newtab/*.png browser/components/newtab/data/content/tippytop/images/
+
# Make DuckDuckGo the default engine
sed '/searchDefault/s/: \".*\"/: "DuckDuckGo"/g' -i browser/components/search/extensions/list.json
sed '/visibleDefaultEngines/{n; s/"ddg",//; s/\"/"ddg", "/}' -i browser/components/search/extensions/list.json
@@ -213,8 +272,6 @@ sed -i 's/<a\ href\=\"http\:\/\/www.mozilla.org\/\">Mozilla\ Project<\/a>/<a\ hr
sed '/Provides/s/abrowser-locale/firefox-locale/' -i debian/control.langpacks
/bin/sed '/trademarkInfo/s/Abrowser/Firefox/' -i l10n/*/browser/branding/official/brand.ftl
-/bin/sed 's/prefs_snippets_description=.*/prefs_snippets_description=Mozilla snippets/' -i l10n/*/browser/chrome/browser/activity-stream/newtab.properties
-
# js settings
cat $DATA/settings.js >> debian/vendor-firefox.js
@@ -253,11 +310,6 @@ browser.suggestedsites.webmaker.title=GNU Project
browser.suggestedsites.webmaker.url=https://www.gnu.org
EOF
-sed -i '/aboutPage.logoTrademark/d' \
-mobile/android/locales/en-US/chrome/about.dtd
-echo -e '\n<!ENTITY aboutPage.logoTrademark "">' >> \
-mobile/android/locales/en-US/chrome/about.dtd
-
# Branding
rm mobile/android/branding/{official,unofficial,beta,nightly} -rf
cp -a $DATA/android/branding/ mobile/android/branding/official