diff --git a/PKGBUILD b/PKGBUILD
index c0bbcc1..49dbf09 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -41,13 +41,13 @@ sha256sums_x86_64=('291a593151e476e6c4b61e48a3bdd5a11896fbde6261dcad347d5b7df265
                    '0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2'
                    'SKIP'
                    'SKIP'
-                   '305b3ac9b96430eb71035ddff558995268a88646d9b4ead50316b39af9da53c7'
+                   '2bef819c55935f6c72a7aa28273ecddfce0888429a32465feb6c34a16ff1ed9c'
                    '4425388d62cbb7ec3808926ae5e04021b17af8a0b6ba47c08a253ecfdcc264c0')
 sha256sums_aarch64=('291a593151e476e6c4b61e48a3bdd5a11896fbde6261dcad347d5b7df265a058'
                     '0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2'
                     'SKIP'
                     'SKIP'
-                    '305b3ac9b96430eb71035ddff558995268a88646d9b4ead50316b39af9da53c7'
+                    '2bef819c55935f6c72a7aa28273ecddfce0888429a32465feb6c34a16ff1ed9c'
                     '4425388d62cbb7ec3808926ae5e04021b17af8a0b6ba47c08a253ecfdcc264c0'
                     '6ca87d2ac7dc48e6f595ca49ac8151936afced30d268a831c6a064b52037f6b7'
                     '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')
diff --git a/binary_tarball/scripts/3_Configure_Source_Code.sh b/binary_tarball/scripts/3_Configure_Source_Code.sh
index 457b1b2..84b4858 100755
--- a/binary_tarball/scripts/3_Configure_Source_Code.sh
+++ b/binary_tarball/scripts/3_Configure_Source_Code.sh
@@ -110,9 +110,7 @@ END
 fi
 
 # hopefully the magic sauce that makes things build on 16.04 and later on work "everywhere":
-patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/drop-check-glibc-symbols.patch"
 patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/build-with-libstdc++-7.patch"
-patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/drop-libstdcxx-check.patch"
 
 # Remove some pre-installed addons that might be questionable
 patch -p1 -i ${CI_PROJECT_DIR}/remove_addons.patch
diff --git a/megabar.patch b/megabar.patch
index 3b03191..7929773 100644
--- a/megabar.patch
+++ b/megabar.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm
-index c557a10..e2c20af 100644
+index 18d73db..7911576 100644
 --- a/browser/components/urlbar/UrlbarInput.jsm
 +++ b/browser/components/urlbar/UrlbarInput.jsm
-@@ -1090,13 +1090,13 @@ class UrlbarInput {
+@@ -1172,13 +1172,13 @@ class UrlbarInput {
  
      // Enable the animation only after the first extend call to ensure it
      // doesn't run when opening a new window.
@@ -23,10 +23,63 @@ index c557a10..e2c20af 100644
    }
  
    endLayoutExtend() {
-diff --git a/browser/themes/shared/urlbar-autocomplete.inc.css b/browser/themes/shared/urlbar-autocomplete.inc.css
-index 13a4595..eda7bdf 100644
---- a/browser/themes/shared/urlbar-autocomplete.inc.css
-+++ b/browser/themes/shared/urlbar-autocomplete.inc.css
+diff --git a/browser/themes/shared/urlbar-searchbar.inc.css b/browser/themes/shared/urlbar-searchbar.inc.css
+index 0b1f693..7de64a1 100644
+--- a/browser/themes/shared/urlbar-searchbar.inc.css
++++ b/browser/themes/shared/urlbar-searchbar.inc.css
+@@ -6,7 +6,7 @@
+ 
+ %define fieldBorderColor hsla(240,5%,5%,.25)
+ %define fieldHoverBorderColor hsla(240,5%,5%,.35)
+-%define urlbarMarginInline 5px
++%define urlbarMarginInline 0px
+ %define urlbarSearchButtonWidth calc(16px + 2 * @identityBoxPaddingInline@)
+ 
+ :root {
+@@ -197,13 +197,13 @@
+ }
+ 
+ #urlbar[breakout][breakout-extend] {
+-  top: -@urlbarBreakoutExtend@;
+-  left: calc(-@urlbarMarginInline@ - @urlbarBreakoutExtend@);
+-  width: calc(100% + 2 * @urlbarMarginInline@ + 2 * @urlbarBreakoutExtend@);
++  top: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2);
++  left: 0;
++  width: 100%;
+ }
+ 
+ #urlbar[breakout][breakout-extend] > #urlbar-background {
+-  box-shadow: 0 3px 8px 0 rgba(0,0,0,.15)
++  box-shadow: 0 1px 4px rgba(0,0,0,.05);
+ }
+ 
+ #urlbar[breakout][breakout-extend][open] > #urlbar-background {
+@@ -211,9 +211,9 @@
+ }
+ 
+ #urlbar[breakout][breakout-extend] > #urlbar-input-container {
+-  height: calc(var(--urlbar-toolbar-height) + 2 * @urlbarBreakoutExtend@);
+-  padding-block: calc(@urlbarBreakoutExtend@ + (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2);
+-  padding-inline: calc(@urlbarMarginInline@ + @urlbarBreakoutExtend@);
++  height: var(--urlbar-height);
++  padding-block: 0;
++  padding-inline: 0;
+ }
+ 
+ #urlbar.searchButton[breakout][breakout-extend] > #urlbar-input-container > #urlbar-search-button {
+@@ -231,7 +231,7 @@
+ }
+ 
+ #urlbar[breakout][breakout-extend] > #urlbar-background {
+-  animation-name: urlbar-grow;
++  animation-name: none;
+   animation-duration: 0s;
+   animation-timing-function: var(--animation-easing-function);
+ }
+diff --git a/browser/themes/shared/urlbarView.inc.css b/browser/themes/shared/urlbarView.inc.css
+index 6b8cac0..54648c6 100644
+--- a/browser/themes/shared/urlbarView.inc.css
++++ b/browser/themes/shared/urlbarView.inc.css
 @@ -48,8 +48,8 @@
    display: block;
    text-shadow: none;
@@ -55,7 +108,7 @@ index 13a4595..eda7bdf 100644
  }
  
  @media (min-resolution: 2dppx) {
-@@ -200,10 +201,10 @@
+@@ -204,10 +205,10 @@
  
  .urlbarView-type-icon {
    position: absolute;
@@ -70,56 +123,3 @@ index 13a4595..eda7bdf 100644
    background-repeat: no-repeat;
    background-size: contain;
    -moz-context-properties: fill, stroke;
-diff --git a/browser/themes/shared/urlbar-searchbar.inc.css b/browser/themes/shared/urlbar-searchbar.inc.css
-index 5d5a3d1..4e84a7f 100644
---- a/browser/themes/shared/urlbar-searchbar.inc.css
-+++ b/browser/themes/shared/urlbar-searchbar.inc.css
-@@ -6,7 +6,7 @@
- 
- %define fieldBorderColor hsla(240,5%,5%,.25)
- %define fieldHoverBorderColor hsla(240,5%,5%,.35)
--%define urlbarMarginInline 5px
-+%define urlbarMarginInline 0px
- %define urlbarSearchButtonWidth calc(16px + 2 * @identityBoxPaddingInline@)
- 
- :root {
-@@ -196,13 +196,13 @@
- }
- 
- #urlbar[breakout][breakout-extend] {
--  top: -@urlbarBreakoutExtend@;
--  left: calc(-@urlbarMarginInline@ - @urlbarBreakoutExtend@);
--  width: calc(100% + 2 * @urlbarMarginInline@ + 2 * @urlbarBreakoutExtend@);
-+  top: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2);
-+  left: 0;
-+  width: 100%;
- }
- 
- #urlbar[breakout][breakout-extend] > #urlbar-background {
--  box-shadow: 0 3px 8px 0 rgba(0,0,0,.15)
-+  box-shadow: 0 1px 4px rgba(0,0,0,.05);
- }
- 
- #urlbar[breakout][breakout-extend][open] > #urlbar-background {
-@@ -210,9 +210,9 @@
- }
- 
- #urlbar[breakout][breakout-extend] > #urlbar-input-container {
--  height: calc(var(--urlbar-toolbar-height) + 2 * @urlbarBreakoutExtend@);
--  padding-block: calc(@urlbarBreakoutExtend@ + (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2);
--  padding-inline: calc(@urlbarMarginInline@ + @urlbarBreakoutExtend@);
-+  height: var(--urlbar-height);
-+  padding-block: 0;
-+  padding-inline: 0;
- }
- 
- #urlbar.searchButton[breakout][breakout-extend] > #urlbar-input-container > #urlbar-search-button {
-@@ -230,7 +230,7 @@
- }
- 
- #urlbar[breakout][breakout-extend] > #urlbar-background {
--  animation-name: urlbar-grow;
-+  animation-name: none;
-   animation-duration: 0s;
-   animation-timing-function: var(--animation-easing-function);
- }