Fixes #3573 - The loading animation at launch is too slow

(cherry picked from commit 42dc42a)
mozilla-mobile · Nov 22, 2022 · 8af8ec0 · 8af8ec0
1 parent ce20d5e
commit 8af8ec0
Show file tree

Hide file tree

Showing 108 changed files with 110 additions and 109 deletions.
diff --git a/Blockzilla/AppDelegate.swift b/Blockzilla/AppDelegate.swift
@@ -16,7 +16,7 @@ enum AppPhase {
     case willEnterForeground
     case didBecomeActive
     case willResignActive
-    case didEnterBackgroundkground
+    case didEnterBackground
     case willTerminate
 }
 
@@ -79,7 +79,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                 guard privacyProtectionWindow == nil else { return }
                 showPrivacyProtectionWindow()
 
-            case .didEnterBackgroundkground:
+            case .didEnterBackground:
                 authenticationManager.logout()
 
             case .notRunning, .willTerminate:
@@ -263,7 +263,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // session. This gets called every time the app goes to background but should not get
         // called for *temporary* interruptions such as an incoming phone call until the user
         // takes action and we are officially backgrounded.
-        appPhase = .didEnterBackgroundkground
+        appPhase = .didEnterBackground
         let orientation = UIDevice.current.orientation.isPortrait ? "Portrait" : "Landscape"
         Telemetry.default.recordEvent(category: TelemetryEventCategory.action, method: TelemetryEventMethod.background, object:
             TelemetryEventObject.app, value: nil, extras: ["orientation": orientation])

diff --git a/Blockzilla/Search/SearchEngineManager.swift b/Blockzilla/Search/SearchEngineManager.swift
@@ -27,6 +27,7 @@ class SearchEngineManager {
 
         set {
             prefs.set(newValue.name, forKey: SearchEngineManager.prefKeyEngine)
+            sortEnginesAlphabetically()
             setActiveEngineAsFirstElement()
         }
     }

diff --git a/Search/SearchPlugins/ar/wikipedia-ar.xml b/Search/SearchPlugins/ar/wikipedia-ar.xml
@@ -5,7 +5,7 @@
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>ويكيبيديا (ar)</ShortName>
 <InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">https://searchfox.org/mozilla-central/source/browser/components/newtab/data/content/tippytop/favicons/wikipedia-org.ico</Image>
+<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAIKADAAQAAAABAAAAIAAAAACshmLzAAAB70lEQVRYCe2XwY3CQAxFYUUL1EAF1EANFEAPlEALNEEl3FMDTZDlRXrImXiS3OZCpMgh9vg/ezzR7rb/XJuG119D7UH6B9C8A7vGM7hp3oHmAJv3+90fj0e+BZP7fD73+LkPh8PIv9/v+/v9Pvhut1vP75hDH7ZcS5y5BwAEXq/XKAm/FddeLpevyPP5HPm7rht8iPHsGi2CCsfcXwACqcQqHo/HJAkL9QNjcizx+LJ1+AGgS1Gc9yMAnLaSbYkCPl+v1y9ETEblp9MpXSM4BZpHOwLgZRTIqomQxLLG6sttUYS4rHr8EwBpaWetoghJPNU7VIpGi3i5ZfonADgcGCCygYpdMDaLI5fdqflTAIIdtlplsQu16gBglmqdxJ8C4GCREFTMu3jHraoBMBPkyGbJXFUAW0cCh81FWk9MbcAAq50mc1QBCPALmQlEQCDLI2aH/CIqWNpZgChSCjD5VOgQAhmTE1++i36fZwEIIgkVxmSCMaxxYCMk8fG3gqVdBKCFAHDbTqs3mQMrpIDZ8LpGuwhAEruAsMnjufadswBQ7WQorF0EIDCeeUSyb4MDa7cioGKZXQXgRM8lj12Y+/CUEKsAWERLa9WblC0iBhjfLdnVAHSBrZgbLNq+ZvIj1Pb3r9lnz5pezf8sbw7wDyZ/pR0QYc+xAAAAAElFTkSuQmCC</Image>
 <Url type="application/x-suggestions+json" method="GET" template="https://ar.wikipedia.org/w/api.php">
   <Param name="action" value="opensearch"/>
   <Param name="search" value="{searchTerms}"/>

diff --git a/Search/SearchPlugins/as/amazon-in.xml b/Search/SearchPlugins/as/amazon-in.xml
@@ -5,7 +5,7 @@
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>Amazon.in</ShortName>
 <InputEncoding>utf-8</InputEncoding>
-<Image width="16" height="16">https://searchfox.org/mozilla-central/source/browser/components/newtab/data/content/tippytop/favicons/amazon.ico</Image>
+<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAIKADAAQAAAABAAAAIAAAAACshmLzAAADvklEQVRYCb1XS0iVQRT+rHuFQnoQFlI3QoJSSnwU9qBVz01RQUKbFkm6aBEquLMgUFpEGbUvhBYpldGmjT0sKvWKUbdUgrDyQUpkqC00+Dvff5v//nPv/A+FOnDunDlzZs4355yZ+S/wlyzLWiJcJ/xR+F/RW1mYPpYov3Yrinzhf+lYlteIQPLpPEsEonkrvJGKMDQ9PY3BwUHHNCsrC3l5eTY7ymDhnZiUQwCc17D5dNrb2619+/dbkWjUyByjzTyojgACQz81NeXrOB1QfX19WAxxAgikExUV2o4XRyJaPx0A+yEj8SsQABcyOSguKbEIzCsleyUdYSgQwJmqqgwA6SFm3wQyDIBFQcXKCk+nhoYGTVVZWan159PhMbSCJriPHQGVlpZmTIlmZ2fo5mZnM3Tpiki6wtTPyclBWVmZMzQ2NobR0VG8ev3a1nV2dtot92KKmDPRIIQCwHl0evPWLbS1tSGRSBiWklvNkC6joVsZplB4EtbFYsZCMxWf0oVZO7AGent7sWPnTjdmR66tqUFs/XoUFhTg4KFDjl4JYWog8BjyvKsdqZZnf2RkRNugGnO3moFHxxeAPDgZzukgHo9ry0lBGu00I4+O7z3Q39+voqm17hPBAS87Fm4Q+QL4OjxsnM97wU13WlvdXUfu7u52ZE/BIzK2uqOjww5t+uPjvopbWlqMNkwV64cvqR/51oBXbtXiYY7m9Rs3/PxbvgA4M/0pdle5WzadFgJkIftRIACvjxF3WpgS2rlfRQIKck5ggQBoxMUZSvX20zkdVFVXZxzJxqYmW6/lfkbujPEe4W7LmtNrQr8JP1wDlsaADcc9i3ZeA79Gga6zwHg7oN7comag8FxqGe7QockBy7q7yrIeH00idgYWKHC33DkjQPlhgWW9b9YW0++B5ZuAI0PA7HegYzvw5BgwdA/4rZ/7FPwAabwLSDQCD9cCMyPAtFxsubu0SXoK1BAd9l0APl1JhS52GlhZJAvslnYzEMlR1smWc34MAJMJCflz4NuD5Eb4QbVDNhFdJmAuAgeeuef9JAD+Kdnq1jryRFxyeCqJXH2ZqVwqI+qVTtmosTVHgZJLACM70QNkCwjKKXpBAHXSv5zSGaTP94GBq7I72RmdKafKoQLAqdTl10ohn5RobaPGj6oJgH/NXgoX+1naY6zqCcnrzBcJ8dOkOb+CoiuT6VmxBVhdnpke88Iv5Atqjz0kIHKFHwj/L7otjnLpXAVRAZGyx2Fhxs5cF7blgn7eyKw+4VbZ+SO1wh8n8D7SurL3OQAAAABJRU5ErkJggg==</Image>
 <Url type="text/html" method="GET" template="https://www.amazon.in/gp/aw/s">
   <Param name="k" value="{searchTerms}"/>
   <Param name="sourceid" value="Mozilla-search"/>

diff --git a/Search/SearchPlugins/as/wikipedia-as.xml b/Search/SearchPlugins/as/wikipedia-as.xml
@@ -5,7 +5,7 @@
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>অসমীয়া ৱিকিপিডিয়া (as)</ShortName>
 <InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">https://searchfox.org/mozilla-central/source/browser/components/newtab/data/content/tippytop/favicons/wikipedia-org.ico</Image>
+<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAIKADAAQAAAABAAAAIAAAAACshmLzAAAB70lEQVRYCe2XwY3CQAxFYUUL1EAF1EANFEAPlEALNEEl3FMDTZDlRXrImXiS3OZCpMgh9vg/ezzR7rb/XJuG119D7UH6B9C8A7vGM7hp3oHmAJv3+90fj0e+BZP7fD73+LkPh8PIv9/v+/v9Pvhut1vP75hDH7ZcS5y5BwAEXq/XKAm/FddeLpevyPP5HPm7rht8iPHsGi2CCsfcXwACqcQqHo/HJAkL9QNjcizx+LJ1+AGgS1Gc9yMAnLaSbYkCPl+v1y9ETEblp9MpXSM4BZpHOwLgZRTIqomQxLLG6sttUYS4rHr8EwBpaWetoghJPNU7VIpGi3i5ZfonADgcGCCygYpdMDaLI5fdqflTAIIdtlplsQu16gBglmqdxJ8C4GCREFTMu3jHraoBMBPkyGbJXFUAW0cCh81FWk9MbcAAq50mc1QBCPALmQlEQCDLI2aH/CIqWNpZgChSCjD5VOgQAhmTE1++i36fZwEIIgkVxmSCMaxxYCMk8fG3gqVdBKCFAHDbTqs3mQMrpIDZ8LpGuwhAEruAsMnjufadswBQ7WQorF0EIDCeeUSyb4MDa7cioGKZXQXgRM8lj12Y+/CUEKsAWERLa9WblC0iBhjfLdnVAHSBrZgbLNq+ZvIj1Pb3r9lnz5pezf8sbw7wDyZ/pR0QYc+xAAAAAElFTkSuQmCC</Image>
 <Url type="application/x-suggestions+json" method="GET" template="https://as.wikipedia.org/w/api.php">
   <Param name="action" value="opensearch"/>
   <Param name="search" value="{searchTerms}"/>

diff --git a/Search/SearchPlugins/az/wikipedia-az.xml b/Search/SearchPlugins/az/wikipedia-az.xml
@@ -5,7 +5,7 @@
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>Vikipediya (az)</ShortName>
 <InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">https://searchfox.org/mozilla-central/source/browser/components/newtab/data/content/tippytop/favicons/wikipedia-org.ico</Image>
+<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAIKADAAQAAAABAAAAIAAAAACshmLzAAAB70lEQVRYCe2XwY3CQAxFYUUL1EAF1EANFEAPlEALNEEl3FMDTZDlRXrImXiS3OZCpMgh9vg/ezzR7rb/XJuG119D7UH6B9C8A7vGM7hp3oHmAJv3+90fj0e+BZP7fD73+LkPh8PIv9/v+/v9Pvhut1vP75hDH7ZcS5y5BwAEXq/XKAm/FddeLpevyPP5HPm7rht8iPHsGi2CCsfcXwACqcQqHo/HJAkL9QNjcizx+LJ1+AGgS1Gc9yMAnLaSbYkCPl+v1y9ETEblp9MpXSM4BZpHOwLgZRTIqomQxLLG6sttUYS4rHr8EwBpaWetoghJPNU7VIpGi3i5ZfonADgcGCCygYpdMDaLI5fdqflTAIIdtlplsQu16gBglmqdxJ8C4GCREFTMu3jHraoBMBPkyGbJXFUAW0cCh81FWk9MbcAAq50mc1QBCPALmQlEQCDLI2aH/CIqWNpZgChSCjD5VOgQAhmTE1++i36fZwEIIgkVxmSCMaxxYCMk8fG3gqVdBKCFAHDbTqs3mQMrpIDZ8LpGuwhAEruAsMnjufadswBQ7WQorF0EIDCeeUSyb4MDa7cioGKZXQXgRM8lj12Y+/CUEKsAWERLa9WblC0iBhjfLdnVAHSBrZgbLNq+ZvIj1Pb3r9lnz5pezf8sbw7wDyZ/pR0QYc+xAAAAAElFTkSuQmCC</Image>
 <Url type="application/x-suggestions+json" method="GET" template="https://az.wikipedia.org/w/api.php">
   <Param name="action" value="opensearch"/>
   <Param name="search" value="{searchTerms}"/>

diff --git a/Search/SearchPlugins/be-BY/be.wikipedia.org.xml b/Search/SearchPlugins/be-BY/be.wikipedia.org.xml
@@ -5,7 +5,7 @@
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>Вікіпедыя (be)</ShortName>
 <InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">https://searchfox.org/mozilla-central/source/browser/components/newtab/data/content/tippytop/favicons/wikipedia-org.ico</Image>
+<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAIKADAAQAAAABAAAAIAAAAACshmLzAAAB70lEQVRYCe2XwY3CQAxFYUUL1EAF1EANFEAPlEALNEEl3FMDTZDlRXrImXiS3OZCpMgh9vg/ezzR7rb/XJuG119D7UH6B9C8A7vGM7hp3oHmAJv3+90fj0e+BZP7fD73+LkPh8PIv9/v+/v9Pvhut1vP75hDH7ZcS5y5BwAEXq/XKAm/FddeLpevyPP5HPm7rht8iPHsGi2CCsfcXwACqcQqHo/HJAkL9QNjcizx+LJ1+AGgS1Gc9yMAnLaSbYkCPl+v1y9ETEblp9MpXSM4BZpHOwLgZRTIqomQxLLG6sttUYS4rHr8EwBpaWetoghJPNU7VIpGi3i5ZfonADgcGCCygYpdMDaLI5fdqflTAIIdtlplsQu16gBglmqdxJ8C4GCREFTMu3jHraoBMBPkyGbJXFUAW0cCh81FWk9MbcAAq50mc1QBCPALmQlEQCDLI2aH/CIqWNpZgChSCjD5VOgQAhmTE1++i36fZwEIIgkVxmSCMaxxYCMk8fG3gqVdBKCFAHDbTqs3mQMrpIDZ8LpGuwhAEruAsMnjufadswBQ7WQorF0EIDCeeUSyb4MDa7cioGKZXQXgRM8lj12Y+/CUEKsAWERLa9WblC0iBhjfLdnVAHSBrZgbLNq+ZvIj1Pb3r9lnz5pezf8sbw7wDyZ/pR0QYc+xAAAAAElFTkSuQmCC</Image>
 <Url type="application/x-suggestions+json" method="GET" template="https://be.wikipedia.org/w/api.php">
   <Param name="action" value="opensearch"/>
   <Param name="search" value="{searchTerms}"/>

diff --git a/Search/SearchPlugins/be/be.wikipedia.org.xml b/Search/SearchPlugins/be/be.wikipedia.org.xml
@@ -5,7 +5,7 @@
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>Вікіпедыя (be)</ShortName>
 <InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">https://searchfox.org/mozilla-central/source/browser/components/newtab/data/content/tippytop/favicons/wikipedia-org.ico</Image>
+<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAIKADAAQAAAABAAAAIAAAAACshmLzAAAB70lEQVRYCe2XwY3CQAxFYUUL1EAF1EANFEAPlEALNEEl3FMDTZDlRXrImXiS3OZCpMgh9vg/ezzR7rb/XJuG119D7UH6B9C8A7vGM7hp3oHmAJv3+90fj0e+BZP7fD73+LkPh8PIv9/v+/v9Pvhut1vP75hDH7ZcS5y5BwAEXq/XKAm/FddeLpevyPP5HPm7rht8iPHsGi2CCsfcXwACqcQqHo/HJAkL9QNjcizx+LJ1+AGgS1Gc9yMAnLaSbYkCPl+v1y9ETEblp9MpXSM4BZpHOwLgZRTIqomQxLLG6sttUYS4rHr8EwBpaWetoghJPNU7VIpGi3i5ZfonADgcGCCygYpdMDaLI5fdqflTAIIdtlplsQu16gBglmqdxJ8C4GCREFTMu3jHraoBMBPkyGbJXFUAW0cCh81FWk9MbcAAq50mc1QBCPALmQlEQCDLI2aH/CIqWNpZgChSCjD5VOgQAhmTE1++i36fZwEIIgkVxmSCMaxxYCMk8fG3gqVdBKCFAHDbTqs3mQMrpIDZ8LpGuwhAEruAsMnjufadswBQ7WQorF0EIDCeeUSyb4MDa7cioGKZXQXgRM8lj12Y+/CUEKsAWERLa9WblC0iBhjfLdnVAHSBrZgbLNq+ZvIj1Pb3r9lnz5pezf8sbw7wDyZ/pR0QYc+xAAAAAElFTkSuQmCC</Image>
 <Url type="application/x-suggestions+json" method="GET" template="https://be.wikipedia.org/w/api.php">
   <Param name="action" value="opensearch"/>
   <Param name="search" value="{searchTerms}"/>

diff --git a/Search/SearchPlugins/bn-IN/wikipedia-bn.xml b/Search/SearchPlugins/bn-IN/wikipedia-bn.xml
@@ -5,7 +5,7 @@
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>উইকিপিডিয়া (bn)</ShortName>
 <InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">https://searchfox.org/mozilla-central/source/browser/components/newtab/data/content/tippytop/favicons/wikipedia-org.ico</Image>
+<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAIKADAAQAAAABAAAAIAAAAACshmLzAAAB70lEQVRYCe2XwY3CQAxFYUUL1EAF1EANFEAPlEALNEEl3FMDTZDlRXrImXiS3OZCpMgh9vg/ezzR7rb/XJuG119D7UH6B9C8A7vGM7hp3oHmAJv3+90fj0e+BZP7fD73+LkPh8PIv9/v+/v9Pvhut1vP75hDH7ZcS5y5BwAEXq/XKAm/FddeLpevyPP5HPm7rht8iPHsGi2CCsfcXwACqcQqHo/HJAkL9QNjcizx+LJ1+AGgS1Gc9yMAnLaSbYkCPl+v1y9ETEblp9MpXSM4BZpHOwLgZRTIqomQxLLG6sttUYS4rHr8EwBpaWetoghJPNU7VIpGi3i5ZfonADgcGCCygYpdMDaLI5fdqflTAIIdtlplsQu16gBglmqdxJ8C4GCREFTMu3jHraoBMBPkyGbJXFUAW0cCh81FWk9MbcAAq50mc1QBCPALmQlEQCDLI2aH/CIqWNpZgChSCjD5VOgQAhmTE1++i36fZwEIIgkVxmSCMaxxYCMk8fG3gqVdBKCFAHDbTqs3mQMrpIDZ8LpGuwhAEruAsMnjufadswBQ7WQorF0EIDCeeUSyb4MDa7cioGKZXQXgRM8lj12Y+/CUEKsAWERLa9WblC0iBhjfLdnVAHSBrZgbLNq+ZvIj1Pb3r9lnz5pezf8sbw7wDyZ/pR0QYc+xAAAAAElFTkSuQmCC</Image>
 <Url type="application/x-suggestions+json" method="GET" template="https://bn.wikipedia.org/w/api.php">
   <Param name="action" value="opensearch"/>
   <Param name="search" value="{searchTerms}"/>

diff --git a/Search/SearchPlugins/br/wikipedia-br.xml b/Search/SearchPlugins/br/wikipedia-br.xml
@@ -5,7 +5,7 @@
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>Wikipedia (br)</ShortName>
 <InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">https://searchfox.org/mozilla-central/source/browser/components/newtab/data/content/tippytop/favicons/wikipedia-org.ico</Image>
+<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAIKADAAQAAAABAAAAIAAAAACshmLzAAAB70lEQVRYCe2XwY3CQAxFYUUL1EAF1EANFEAPlEALNEEl3FMDTZDlRXrImXiS3OZCpMgh9vg/ezzR7rb/XJuG119D7UH6B9C8A7vGM7hp3oHmAJv3+90fj0e+BZP7fD73+LkPh8PIv9/v+/v9Pvhut1vP75hDH7ZcS5y5BwAEXq/XKAm/FddeLpevyPP5HPm7rht8iPHsGi2CCsfcXwACqcQqHo/HJAkL9QNjcizx+LJ1+AGgS1Gc9yMAnLaSbYkCPl+v1y9ETEblp9MpXSM4BZpHOwLgZRTIqomQxLLG6sttUYS4rHr8EwBpaWetoghJPNU7VIpGi3i5ZfonADgcGCCygYpdMDaLI5fdqflTAIIdtlplsQu16gBglmqdxJ8C4GCREFTMu3jHraoBMBPkyGbJXFUAW0cCh81FWk9MbcAAq50mc1QBCPALmQlEQCDLI2aH/CIqWNpZgChSCjD5VOgQAhmTE1++i36fZwEIIgkVxmSCMaxxYCMk8fG3gqVdBKCFAHDbTqs3mQMrpIDZ8LpGuwhAEruAsMnjufadswBQ7WQorF0EIDCeeUSyb4MDa7cioGKZXQXgRM8lj12Y+/CUEKsAWERLa9WblC0iBhjfLdnVAHSBrZgbLNq+ZvIj1Pb3r9lnz5pezf8sbw7wDyZ/pR0QYc+xAAAAAElFTkSuQmCC</Image>
 <Url type="application/x-suggestions+json" method="GET" template="https://br.wikipedia.org/w/api.php">
   <Param name="action" value="opensearch"/>
   <Param name="search" value="{searchTerms}"/>

diff --git a/Search/SearchPlugins/ca/wikipedia-ca.xml b/Search/SearchPlugins/ca/wikipedia-ca.xml
@@ -5,7 +5,7 @@
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>Viquipèdia (ca)</ShortName>
 <InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">https://searchfox.org/mozilla-central/source/browser/components/newtab/data/content/tippytop/favicons/wikipedia-org.ico</Image>
+<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAIKADAAQAAAABAAAAIAAAAACshmLzAAAB70lEQVRYCe2XwY3CQAxFYUUL1EAF1EANFEAPlEALNEEl3FMDTZDlRXrImXiS3OZCpMgh9vg/ezzR7rb/XJuG119D7UH6B9C8A7vGM7hp3oHmAJv3+90fj0e+BZP7fD73+LkPh8PIv9/v+/v9Pvhut1vP75hDH7ZcS5y5BwAEXq/XKAm/FddeLpevyPP5HPm7rht8iPHsGi2CCsfcXwACqcQqHo/HJAkL9QNjcizx+LJ1+AGgS1Gc9yMAnLaSbYkCPl+v1y9ETEblp9MpXSM4BZpHOwLgZRTIqomQxLLG6sttUYS4rHr8EwBpaWetoghJPNU7VIpGi3i5ZfonADgcGCCygYpdMDaLI5fdqflTAIIdtlplsQu16gBglmqdxJ8C4GCREFTMu3jHraoBMBPkyGbJXFUAW0cCh81FWk9MbcAAq50mc1QBCPALmQlEQCDLI2aH/CIqWNpZgChSCjD5VOgQAhmTE1++i36fZwEIIgkVxmSCMaxxYCMk8fG3gqVdBKCFAHDbTqs3mQMrpIDZ8LpGuwhAEruAsMnjufadswBQ7WQorF0EIDCeeUSyb4MDa7cioGKZXQXgRM8lj12Y+/CUEKsAWERLa9WblC0iBhjfLdnVAHSBrZgbLNq+ZvIj1Pb3r9lnz5pezf8sbw7wDyZ/pR0QYc+xAAAAAElFTkSuQmCC</Image>
 <Url type="application/x-suggestions+json" method="GET" template="https://ca.wikipedia.org/w/api.php">
   <Param name="action" value="opensearch"/>
   <Param name="search" value="{searchTerms}"/>

diff --git a/Search/SearchPlugins/cs/wikipedia-cz.xml b/Search/SearchPlugins/cs/wikipedia-cz.xml
@@ -5,7 +5,7 @@
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>Wikipedie (cs)</ShortName>
 <InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">https://searchfox.org/mozilla-central/source/browser/components/newtab/data/content/tippytop/favicons/wikipedia-org.ico</Image>
+<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAIKADAAQAAAABAAAAIAAAAACshmLzAAAB70lEQVRYCe2XwY3CQAxFYUUL1EAF1EANFEAPlEALNEEl3FMDTZDlRXrImXiS3OZCpMgh9vg/ezzR7rb/XJuG119D7UH6B9C8A7vGM7hp3oHmAJv3+90fj0e+BZP7fD73+LkPh8PIv9/v+/v9Pvhut1vP75hDH7ZcS5y5BwAEXq/XKAm/FddeLpevyPP5HPm7rht8iPHsGi2CCsfcXwACqcQqHo/HJAkL9QNjcizx+LJ1+AGgS1Gc9yMAnLaSbYkCPl+v1y9ETEblp9MpXSM4BZpHOwLgZRTIqomQxLLG6sttUYS4rHr8EwBpaWetoghJPNU7VIpGi3i5ZfonADgcGCCygYpdMDaLI5fdqflTAIIdtlplsQu16gBglmqdxJ8C4GCREFTMu3jHraoBMBPkyGbJXFUAW0cCh81FWk9MbcAAq50mc1QBCPALmQlEQCDLI2aH/CIqWNpZgChSCjD5VOgQAhmTE1++i36fZwEIIgkVxmSCMaxxYCMk8fG3gqVdBKCFAHDbTqs3mQMrpIDZ8LpGuwhAEruAsMnjufadswBQ7WQorF0EIDCeeUSyb4MDa7cioGKZXQXgRM8lj12Y+/CUEKsAWERLa9WblC0iBhjfLdnVAHSBrZgbLNq+ZvIj1Pb3r9lnz5pezf8sbw7wDyZ/pR0QYc+xAAAAAElFTkSuQmCC</Image>
 <Url type="application/x-suggestions+json" method="GET" template="https://cs.wikipedia.org/w/api.php">
   <Param name="action" value="opensearch"/>
   <Param name="search" value="{searchTerms}"/>

diff --git a/Search/SearchPlugins/cy/amazon-en-GB.xml b/Search/SearchPlugins/cy/amazon-en-GB.xml
@@ -1,7 +1,7 @@
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>Amazon.co.uk</ShortName>
 <InputEncoding>ISO-8859-1</InputEncoding>
-<Image width="16" height="16">https://searchfox.org/mozilla-central/source/browser/components/newtab/data/content/tippytop/favicons/amazon.ico</Image>
+<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAIKADAAQAAAABAAAAIAAAAACshmLzAAADvklEQVRYCb1XS0iVQRT+rHuFQnoQFlI3QoJSSnwU9qBVz01RQUKbFkm6aBEquLMgUFpEGbUvhBYpldGmjT0sKvWKUbdUgrDyQUpkqC00+Dvff5v//nPv/A+FOnDunDlzZs4355yZ+S/wlyzLWiJcJ/xR+F/RW1mYPpYov3Yrinzhf+lYlteIQPLpPEsEonkrvJGKMDQ9PY3BwUHHNCsrC3l5eTY7ymDhnZiUQwCc17D5dNrb2619+/dbkWjUyByjzTyojgACQz81NeXrOB1QfX19WAxxAgikExUV2o4XRyJaPx0A+yEj8SsQABcyOSguKbEIzCsleyUdYSgQwJmqqgwA6SFm3wQyDIBFQcXKCk+nhoYGTVVZWan159PhMbSCJriPHQGVlpZmTIlmZ2fo5mZnM3Tpiki6wtTPyclBWVmZMzQ2NobR0VG8ev3a1nV2dtot92KKmDPRIIQCwHl0evPWLbS1tSGRSBiWklvNkC6joVsZplB4EtbFYsZCMxWf0oVZO7AGent7sWPnTjdmR66tqUFs/XoUFhTg4KFDjl4JYWog8BjyvKsdqZZnf2RkRNugGnO3moFHxxeAPDgZzukgHo9ry0lBGu00I4+O7z3Q39+voqm17hPBAS87Fm4Q+QL4OjxsnM97wU13WlvdXUfu7u52ZE/BIzK2uqOjww5t+uPjvopbWlqMNkwV64cvqR/51oBXbtXiYY7m9Rs3/PxbvgA4M/0pdle5WzadFgJkIftRIACvjxF3WpgS2rlfRQIKck5ggQBoxMUZSvX20zkdVFVXZxzJxqYmW6/lfkbujPEe4W7LmtNrQr8JP1wDlsaADcc9i3ZeA79Gga6zwHg7oN7comag8FxqGe7QockBy7q7yrIeH00idgYWKHC33DkjQPlhgWW9b9YW0++B5ZuAI0PA7HegYzvw5BgwdA/4rZ/7FPwAabwLSDQCD9cCMyPAtFxsubu0SXoK1BAd9l0APl1JhS52GlhZJAvslnYzEMlR1smWc34MAJMJCflz4NuD5Eb4QbVDNhFdJmAuAgeeuef9JAD+Kdnq1jryRFxyeCqJXH2ZqVwqI+qVTtmosTVHgZJLACM70QNkCwjKKXpBAHXSv5zSGaTP94GBq7I72RmdKafKoQLAqdTl10ohn5RobaPGj6oJgH/NXgoX+1naY6zqCcnrzBcJ8dOkOb+CoiuT6VmxBVhdnpke88Iv5Atqjz0kIHKFHwj/L7otjnLpXAVRAZGyx2Fhxs5cF7blgn7eyKw+4VbZ+SO1wh8n8D7SurL3OQAAAABJRU5ErkJggg==</Image>
 <Url type="text/html" method="GET" template="https://www.amazon.co.uk/exec/obidos/external-search/">
   <Param name="field-keywords" value="{searchTerms}"/>
   <Param name="mode" value="blended"/>

diff --git a/Search/SearchPlugins/cy/wikipedia-cy.xml b/Search/SearchPlugins/cy/wikipedia-cy.xml
@@ -5,7 +5,7 @@
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>Wicipedia (cy)</ShortName>
 <InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">https://searchfox.org/mozilla-central/source/browser/components/newtab/data/content/tippytop/favicons/wikipedia-org.ico</Image>
+<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAIKADAAQAAAABAAAAIAAAAACshmLzAAAB70lEQVRYCe2XwY3CQAxFYUUL1EAF1EANFEAPlEALNEEl3FMDTZDlRXrImXiS3OZCpMgh9vg/ezzR7rb/XJuG119D7UH6B9C8A7vGM7hp3oHmAJv3+90fj0e+BZP7fD73+LkPh8PIv9/v+/v9Pvhut1vP75hDH7ZcS5y5BwAEXq/XKAm/FddeLpevyPP5HPm7rht8iPHsGi2CCsfcXwACqcQqHo/HJAkL9QNjcizx+LJ1+AGgS1Gc9yMAnLaSbYkCPl+v1y9ETEblp9MpXSM4BZpHOwLgZRTIqomQxLLG6sttUYS4rHr8EwBpaWetoghJPNU7VIpGi3i5ZfonADgcGCCygYpdMDaLI5fdqflTAIIdtlplsQu16gBglmqdxJ8C4GCREFTMu3jHraoBMBPkyGbJXFUAW0cCh81FWk9MbcAAq50mc1QBCPALmQlEQCDLI2aH/CIqWNpZgChSCjD5VOgQAhmTE1++i36fZwEIIgkVxmSCMaxxYCMk8fG3gqVdBKCFAHDbTqs3mQMrpIDZ8LpGuwhAEruAsMnjufadswBQ7WQorF0EIDCeeUSyb4MDa7cioGKZXQXgRM8lj12Y+/CUEKsAWERLa9WblC0iBhjfLdnVAHSBrZgbLNq+ZvIj1Pb3r9lnz5pezf8sbw7wDyZ/pR0QYc+xAAAAAElFTkSuQmCC</Image>
 <Url type="application/x-suggestions+json" method="GET" template="https://cy.wikipedia.org/w/api.php">
   <Param name="action" value="opensearch"/>
   <Param name="search" value="{searchTerms}"/>
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,7 @@ class SearchEngineManager { @@
             set {
                 prefs.set(newValue.name, forKey: SearchEngineManager.prefKeyEngine)
+                sortEnginesAlphabetically()
                 setActiveEngineAsFirstElement()
             }
         }
@@ Expand Down @@