diff --git a/helpers/DATA/firefox/settings.js b/helpers/DATA/firefox/settings.js
index de68b7d4514b46e816774ae9ce96a8a13cb91927..c0f507ea1edf444f941b93ad252babb29aeb7f0c 100644
--- a/helpers/DATA/firefox/settings.js
+++ b/helpers/DATA/firefox/settings.js
@@ -132,7 +132,7 @@ pref("browser.aboutHomeSnippets.updateUrl", "");
 pref("browser.sessionstore.max_resumed_crashes", 0);
  // Disable tracking protection by default, as it makes automated connections to fetch lists (not doing this until the newtab privacy block is reimplemented)
  //pref("browser.safebrowsing.provider.mozilla.updateURL", "");
-pref("urlclassifier.trackingTable", "test-track-simple,base-track-digest256,content-track-digest256");
+//pref("urlclassifier.trackingTable", "test-track-simple,base-track-digest256,content-track-digest256");
 pref("privacy.trackingprotection.introURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tracking-protection/start/");
 // Disable geolocation
 pref("geo.enabled", false);
@@ -143,7 +143,10 @@ pref("network.captive-portal-service.enabled", false);
 // Disable shield/heartbeat
 pref("extensions.shield-recipe-client.enabled", false);
 // Canvas fingerprint protection
-pref("privacy.resistFingerprinting", true);
+// Disabled, as it breaks things and does little improvements to fingerprinting
+//pref("privacy.resistFingerprinting", true);
+//pref("privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts", false);
+
 // Webgl can be used for fingerprinting
 pref("webgl.disabled", true);
 // Don't reveal your internal IP when WebRTC is enabled
@@ -251,6 +254,14 @@ pref("extensions.blocklist.url", "");
 pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr", false);
 pref("extensions.htmlaboutaddons.discover.enabled", false);
 pref("extensions.htmlaboutaddons.recommendations.enabled", false);
+//pref("browser.newtabpage.activity-stream.asrouterExperimentEnabled", false);
+pref("extensions.getAddons.get.url", "");
+pref("extensions.getAddons.link.url", "https://trisquel.info/en/browser-plain");
+pref("extensions.getAddons.langpacks.url", "");
+pref("extensions.getAddons.discovery.api_url", "");
+pref("extensions.recommendations.privacyPolicyUrl", "https://trisquel.info/legal");
+pref("extensions.getAddons.search.browseURL", "https://trisquel.info/en/browser-plain?keys=%TERMS%&tid=All");
+
 
 // Disable pingback on first run
 pref("browser.newtabpage.activity-stream.fxaccounts.endpoint", "");
diff --git a/helpers/make-firefox b/helpers/make-firefox
index 0aa9c43871cf54067d7871e950761cb927be7118..8ed3c7f7e209c988ca850b383b52f6dfcd80d16a 100644
--- a/helpers/make-firefox
+++ b/helpers/make-firefox
@@ -151,6 +151,7 @@ s|Firefox Nightly|Abrowser|;
 s|Nightly|Abrowser|g;
 s|brandProductName=Firefox|brandProductName=Abrowser|;
 s|Sign in to Firefox|Sign in to Sync|;
+s|Search addons.mozilla.org|Search|g;
 "
 
 echo "Running batch replace operation"
@@ -203,13 +204,11 @@ EOF
 
 # Hide mobile promo
 echo ".fxaMobilePromo {  display: none !important; }" >> browser/themes/shared/incontentprefs/preferences.inc.css
-# Hide plugindeprecation-notice
-echo "#plugindeprecation-notice {  display: none !important; }" >> toolkit/mozapps/extensions/content/extensions.css
+# Hide unwanted elements on about:addons
+echo ".discopane-notice, .privacy-policy-link, #main header, #plugindeprecation-notice {  display: none !important; }" >> toolkit/mozapps/extensions/content/aboutaddons.css
 # Hide warnings on unsigned extensions
 echo ".warning{display: none!important; } .addon[notification=warning]{background-image: none!important;}" >> toolkit/mozapps/extensions/content/extensions.css
 # Hide extra links in about box
-sed '/releaseNotes.link/d' -i ./browser/base/content/aboutDialog.xul
-sed '/description.*helpus/,/description/d' -i ./browser/base/content/aboutDialog.xul
 
 find -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i
 
@@ -259,8 +258,6 @@ MOZ_TELEMETRY_REPORTING=0
 MOZ_ADDON_SIGNING=0
 EOF
 
-sed '/SENDERID/d' -i mobile/android/app/mobile.js
-
 # Fix locale
 cat << EOF >> mobile/locales/en-US/chrome/region.properties
 browser.search.defaultenginename=DuckDuckGo