From 2633c9b9684c7c3f487f229ea487a19cf38c2fe9 Mon Sep 17 00:00:00 2001
From: Craig Cook <craigcook@users.noreply.github.com>
Date: Tue, 3 Dec 2024 16:16:56 -0800
Subject: [PATCH 1/6] Refresh: misc tweaks and refinements

* Adjust font sizes on some Firefox pages [#15416]
* Update fonts and icons in some footer elements.
* Some minor refactoring and tidying in footer.
---
 .../protocol/footer/footer-refresh.html       |   4 +-
 .../firefox/browsers/chromebook.html          |   2 +-
 .../firefox/browsers/mobile/android.html      |   2 +-
 .../firefox/browsers/mobile/focus.html        |   2 +-
 .../firefox/browsers/mobile/ios.html          |   2 +-
 .../templates/firefox/browsers/quantum.html   |   2 +-
 bedrock/firefox/templates/firefox/faq.html    |   2 +-
 media/css/firefox/enterprise/landing.scss     |   2 +-
 .../css/m24/components/footer-newsletter.scss |   4 +-
 media/css/m24/components/footer-refresh.scss  | 127 ++++++------------
 10 files changed, 51 insertions(+), 98 deletions(-)

diff --git a/bedrock/base/templates/includes/protocol/footer/footer-refresh.html b/bedrock/base/templates/includes/protocol/footer/footer-refresh.html
index 6aec2e77ea9..3bcd63f7da9 100644
--- a/bedrock/base/templates/includes/protocol/footer/footer-refresh.html
+++ b/bedrock/base/templates/includes/protocol/footer/footer-refresh.html
@@ -92,7 +92,9 @@ <h2 class="moz24-footer-heading-social">{{ ftl('footer-refresh-follow-firefox')
     <div class="moz24-footer-actions">
       <a class="moz24-footer-donate" href="{{ donate_url(location='moco-donate-footer') }}" data-link-type="button" data-link-text="Donate">
         <span class="mzp-c-button-icon-start">
-          <svg height="640" viewBox="0 0 896.173 896.173" width="640" xmlns="http://www.w3.org/2000/svg"><switch><path d="m415.586 381.044v-65.006h65.001v65.006zm151.61-179.868c-34.105 0-63.39 12.422-86.609 27.824v87.038c4.788-5.861 12.53-14.509 22.611-22.98 21.228-17.838 42.76-26.882 63.998-26.882 47.765 0 86.625 40.383 86.625 90.02 0 72.488-58.765 143.314-108.062 189.965-37.953 35.915-76.426 63.436-97.672 77.68-21.246-14.244-59.72-41.765-97.673-77.68-49.297-46.651-108.062-117.477-108.062-189.964 0-49.638 38.86-90.021 86.625-90.021 21.239 0 42.77 9.044 63.998 26.882 10.082 8.472 17.823 17.119 22.611 22.98v-87.038c-23.218-15.402-52.503-27.824-86.609-27.824-83.606 0-151.625 69.542-151.625 155.02 0 43.355 14.14 88.366 42.027 133.784 21.258 34.62 50.627 69.704 87.29 104.273 61.41 57.902 122.133 94.58 124.688 96.112l7.735 4.632h17.989l7.735-4.632c2.555-1.533 63.278-38.21 124.687-96.112 36.664-34.57 66.033-69.652 87.29-104.273 27.888-45.418 42.028-90.429 42.028-133.783 0-85.479-68.019-155.021-151.625-155.021"/></switch></svg>
+          <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor">
+            <path d="M16.34 2.93c-1.26 0-2.34.46-3.2 1.03-.11.09-.57.43-.84.82h-.71c-.28-.4-.75-.75-.85-.81s-.02-.01-.03-.02h-.01c-.85-.56-1.92-1-3.16-1-3.09 0-5.6 2.57-5.6 5.73 0 1.6.52 3.26 1.55 4.94.79 1.28 1.87 2.57 3.22 3.85 2.27 2.14 4.51 3.49 4.61 3.55l.29.17h.66l.29-.17c.09-.06 2.34-1.41 4.61-3.55 1.35-1.28 2.44-2.57 3.22-3.85 1.03-1.68 1.55-3.34 1.55-4.94 0-3.16-2.51-5.73-5.6-5.73Zm-.8 12.74c-1.4 1.33-2.82 2.34-3.61 2.87-.78-.53-2.21-1.54-3.61-2.87-1.82-1.72-3.99-4.34-3.99-7.02 0-1.83 1.44-3.33 3.2-3.33.78 0 1.58.33 2.36.99.37.31.66.63.83.85s0 .01 0 .01v2.39h2.4V7.15c.18-.22.46-.53.83-.84.78-.66 1.58-.99 2.36-.99 1.76 0 3.2 1.49 3.2 3.33 0 2.68-2.17 5.29-3.99 7.02Z"/>
+          </svg>
         </span>
         <span class="mzp-c-button-icon-text">{{ ftl('footer-refresh-donate') }}</span>
       </a>
diff --git a/bedrock/firefox/templates/firefox/browsers/chromebook.html b/bedrock/firefox/templates/firefox/browsers/chromebook.html
index 8df3f2b1407..92099c7261e 100644
--- a/bedrock/firefox/templates/firefox/browsers/chromebook.html
+++ b/bedrock/firefox/templates/firefox/browsers/chromebook.html
@@ -42,7 +42,7 @@
     media_class='mzp-l-split-h-center'
   ) %}
   <div class="mzp-c-logo mzp-t-logo-lg mzp-t-product-firefox"></div>
-  <h1 class="mzp-u-title-xl">{{ ftl('browsers-chromebook-get-firefox-browser') }}</h1>
+  <h1 class="mzp-u-title-lg">{{ ftl('browsers-chromebook-get-firefox-browser') }}</h1>
   <p>{{ ftl('browsers-chromebook-so-youve-got') }}</p>
 
   <div class="mzp-c-menu-list mzp-t-cta mzp-t-download" id="chromebook-download-list">
diff --git a/bedrock/firefox/templates/firefox/browsers/mobile/android.html b/bedrock/firefox/templates/firefox/browsers/mobile/android.html
index 6bcf4bfce41..b3593da772b 100644
--- a/bedrock/firefox/templates/firefox/browsers/mobile/android.html
+++ b/bedrock/firefox/templates/firefox/browsers/mobile/android.html
@@ -62,7 +62,7 @@
     media_after=True
   ) %}
     <div class="mzp-c-wordmark mzp-t-wordmark-md mzp-t-product-firefox">{{ ftl('firefox-ios-firefox-browser') }}</div>
-    <h1 class="mzp-u-title-xl">{{ ftl('mobile-android-short-cut-the-internet') }}</h1>
+    <h1 class="mzp-u-title-lg">{{ ftl('mobile-android-short-cut-the-internet') }}</h1>
     <p class="c-tagline">{{ ftl('mobile-android-see-all-your-open-tabs') }}</p>
     <p class="c-cta">
       {{ google_play_button(href=android_url, id='playStoreLink-primary') }}
diff --git a/bedrock/firefox/templates/firefox/browsers/mobile/focus.html b/bedrock/firefox/templates/firefox/browsers/mobile/focus.html
index 9aeb0f47d8e..9dbe119f09f 100644
--- a/bedrock/firefox/templates/firefox/browsers/mobile/focus.html
+++ b/bedrock/firefox/templates/firefox/browsers/mobile/focus.html
@@ -58,7 +58,7 @@
     media_after=True
   ) %}
     <div class="mzp-c-wordmark mzp-t-wordmark-md mzp-t-product-{% if LANG=='de' %}klar{% else %}focus{% endif %}">{{ ftl('mobile-focus-firefox-focus') }}</div>
-    <h1 class="mzp-u-title-xl">{{ ftl('mobile-focus-simply-private-mobile') }}</h1>
+    <h1 class="mzp-u-title-lg">{{ ftl('mobile-focus-simply-private-mobile') }}</h1>
     <p class="c-tagline">{{ ftl('mobile-focus-firefox-focus-dedicated-with-v2') }}</p>
     <p>{{ ftl('mobile-focus-firefox-focus-is-available') }}</p>
 
diff --git a/bedrock/firefox/templates/firefox/browsers/mobile/ios.html b/bedrock/firefox/templates/firefox/browsers/mobile/ios.html
index 37d41afef59..90fb0570e69 100644
--- a/bedrock/firefox/templates/firefox/browsers/mobile/ios.html
+++ b/bedrock/firefox/templates/firefox/browsers/mobile/ios.html
@@ -62,7 +62,7 @@
     media_after=True
   ) %}
     <div class="mzp-c-wordmark mzp-t-wordmark-md mzp-t-product-firefox">{{ ftl('mobile-ios-firefox-browser') }}</div>
-    <h1 class="mzp-u-title-xl">
+    <h1 class="mzp-u-title-lg">
       {{ ftl('mobile-ios-get-to-your-go-to') }}
     </h1>
     <p class="c-tagline">{{ self.page_desc() }}</p>
diff --git a/bedrock/firefox/templates/firefox/browsers/quantum.html b/bedrock/firefox/templates/firefox/browsers/quantum.html
index 519c9967c5b..d540600bcbe 100644
--- a/bedrock/firefox/templates/firefox/browsers/quantum.html
+++ b/bedrock/firefox/templates/firefox/browsers/quantum.html
@@ -30,7 +30,7 @@
     block_class='mzp-l-split-hide-media-on-sm-md'
   ) %}
   <div class="mzp-c-logo mzp-t-logo-lg mzp-t-product-firefox"></div>
-  <h1 class="mzp-u-title-xl">{{ ftl('the-latest-firefox') }}</h1>
+  <h1 class="mzp-u-title-lg">{{ ftl('the-latest-firefox') }}</h1>
   <p>{{ ftl('firefox-quantum-was') }}</p>
   {{ download_firefox_thanks() }}
   <p><a class="mzp-c-cta-link" href="https://blog.mozilla.org/blog/2017/11/14/introducing-firefox-quantum/?utm_source=mozilla.org-firefox-browsers-quantum&utm_medium=referral&utm_campaign=seo-quantum&amp;utm_content=hero&amp;entrypoint=mozilla.org-firefox-browsers-quantum">{{ ftl('learn-more-about') }}</a></p>
diff --git a/bedrock/firefox/templates/firefox/faq.html b/bedrock/firefox/templates/firefox/faq.html
index a6ccf3f3258..3656d27a64e 100644
--- a/bedrock/firefox/templates/firefox/faq.html
+++ b/bedrock/firefox/templates/firefox/faq.html
@@ -57,7 +57,7 @@
       media_after=True
   ) %}
   <div class="mzp-c-logo mzp-t-logo-lg mzp-t-product-firefox"></div>
-  <h1 class="mzp-u-title-xl">{{ ftl('firefox-faq')}}</h1>
+  <h1 class="mzp-u-title-lg">{{ ftl('firefox-faq')}}</h1>
   <p>{{ ftl('whether-you-searched-independant') }}</p>
   {{ download_firefox_thanks() }}
   {% endcall %}
diff --git a/media/css/firefox/enterprise/landing.scss b/media/css/firefox/enterprise/landing.scss
index ebf0bc4409b..ea18a0c85f7 100644
--- a/media/css/firefox/enterprise/landing.scss
+++ b/media/css/firefox/enterprise/landing.scss
@@ -84,7 +84,7 @@ $image-path: '/media/protocol/img';
         position: relative;
 
         .mzp-c-split-title {
-            @include text-title-xl;
+            @include text-title-lg;
             margin-bottom: $spacing-md;
 
             @media #{$mq-md} {
diff --git a/media/css/m24/components/footer-newsletter.scss b/media/css/m24/components/footer-newsletter.scss
index ace9777960a..fc4bb13be2b 100644
--- a/media/css/m24/components/footer-newsletter.scss
+++ b/media/css/m24/components/footer-newsletter.scss
@@ -97,7 +97,6 @@ $max-footer-content-width: $content-max;
         .mzp-c-newsletter-thanks {
             h3 {
                 color: $m24-color-black;
-                font-family: $secondary-font;
             }
 
             p {
@@ -258,11 +257,10 @@ $max-footer-content-width: $content-max;
         button {
             border: $border-width solid $m24-color-black;
             border-radius: 0;
-            font-family: $secondary-font;
             position: relative;
             max-width: 800px;
             width: 100%;
-            font-weight: 500;
+            font-weight: 600;
 
             &:hover,
             &:focus-visible {
diff --git a/media/css/m24/components/footer-refresh.scss b/media/css/m24/components/footer-refresh.scss
index 104eb676d6f..ad0189057f2 100644
--- a/media/css/m24/components/footer-refresh.scss
+++ b/media/css/m24/components/footer-refresh.scss
@@ -109,21 +109,15 @@ $max-footer-content-width: $content-max;
         display: inline-block;
 
         a {
+            @include bidi(((margin-right, 8px, 0), (margin-left, 0, 8px)));
+            @include image-replaced;
             background-repeat: no-repeat;
+            background-size: 16px 16px;
+            background-position: center center;
             border-bottom: 1px solid rgba(0,0,0,0);
-            direction: ltr;
             display: block;
-            height: 16px;
-            overflow: hidden;
-            text-align: left;
-            text-indent: -9999px;
-            white-space: nowrap;
-            width: 16px;
-            @include bidi(((margin-right, 8px, 0), (margin-left, 0, 8px)));
-
-            @media(min-width: $screen-md) {
-                @include bidi(((margin-right, 16px, 0), (margin-left, 0, 16px)));
-            }
+            height: 24px;
+            width: 24px;
 
             &:hover,
             &:focus {
@@ -254,7 +248,7 @@ $max-footer-content-width: $content-max;
 .moz24-footer-donate {
     position: relative;
     border-radius: 0;
-    font-weight: 500;
+    font-weight: 600;
     background-color: $m24-color-alt-white;
     color: $m24-color-black;
     padding: 6px 24px;
@@ -262,6 +256,7 @@ $max-footer-content-width: $content-max;
     text-decoration: none;
     text-align: center;
     max-width: 800px;
+    margin-bottom: $spacer-lg;
 
     &:link,
     &:visited {
@@ -269,43 +264,18 @@ $max-footer-content-width: $content-max;
     }
 
     &:hover,
-    &:visited:hover {
+    &:visited:hover,
+    &:focus,
+    &:focus-visible,
+    &:visited:focus-visible {
+        color: $m24-color-white;
         background-color: $m24-color-black;
-
-        span {
-            color: $m24-color-white;
-        }
-
-        .mzp-c-button-icon-start svg path {
-            fill: $m24-color-white;
-        }
     }
 
     &:active,
     &:visited:active {
         background-color: transparent;
         box-shadow: none;
-
-        span {
-            color: $m24-color-black;
-        }
-
-        .mzp-c-button-icon-start svg path {
-            fill: $m24-color-black;
-        }
-
-        .mzp-c-button-icon-text::after {
-            display: none;
-        }
-    }
-
-    &:focus-visible,
-    &:visited:focus-visible {
-        color: $m24-color-white;
-
-        .mzp-c-button-icon-start svg path {
-            fill: $m24-color-black;
-        }
     }
 
     @media(min-width: $screen-md) {
@@ -313,26 +283,9 @@ $max-footer-content-width: $content-max;
     }
 }
 
-.mzp-c-button-icon-start {
-    font-size: 1.7em;
-    vertical-align: middle;
-    margin-right: 0;
-
-    svg path {
-        fill: $m24-color-black;
-    }
-}
-
-.mzp-c-button-icon-text {
-    position: relative;
-    font-family: $secondary-font;
-    color: $m24-color-black;
-}
 
 // language form
 .moz24-footer-language {
-    margin-top: $spacer-lg;
-    margin-bottom: 0;
     position: relative;
 }
 
@@ -341,52 +294,52 @@ $max-footer-content-width: $content-max;
     border-color: transparent;
 
     &::before {
-        display: block;
-        content: "";
-        position: absolute;
-        width: 32px;
-        height: 32px;
         @include bidi(((left, 0, 0), (right, 0, 102px)));
-        bottom: 0;
+        background: transparent url('/media/img/icons/m24-small/globe-white.svg') center center no-repeat;
+        background-size: 18px 18px;
+        top: 50%;
+        margin-top: -16px;
         color: $m24-color-white;
-        background-repeat: no-repeat;
-        background-position-x: 8px;
-        background-position-y: -2px;
-        background-image: url('/media/img/logos/mozilla/footer-refresh/icon-globe.svg');
+        content: "";
+        display: block;
+        height: 32px;
+        width: 32px;
+        position: absolute;
     }
 
     label {
-        border: 0;
-        clip: rect(0 0 0 0);
-        height: 1px;
-        margin: -1px;
-        overflow: hidden;
-        padding: 0;
-        position: absolute;
-        width: 1px;
+        @include visually-hidden;
     }
 
     .mzp-c-language-switcher-link {
         @include visually-hidden;
+
+        &:focus,
+        &:focus-visible {
+            clip: auto;
+            color: $m24-color-black;
+            height: auto;
+            overflow: visible;
+            text-indent: 0;
+            top: -1.5em;
+            width: auto;
+        }
     }
 
     .mzp-js-language-switcher-select {
-        border: $border-width solid transparent;
+        background: $m24-color-alt-white url('/media/img/logos/mozilla/footer-refresh/icon-arrow-down.svg') 95px 9px no-repeat;
         border-radius: 0;
-        font-family: $secondary-font;
+        border: $border-width solid transparent;
+        color: $m24-color-black;
         font-weight: 600;
-        padding-left: 36px;
+        margin-top: 16px;
         min-width: unset;
+        padding-left: 36px;
         width: 136px;
-        background: $m24-color-alt-white;
-        color: $m24-color-black;
-        background-position-x: 95px;
-        background-position-y: 9px;
-        background-image: url('/media/img/logos/mozilla/footer-refresh/icon-arrow-down.svg');
-        background-repeat: no-repeat;
         margin-top: 16px;
 
         &:hover,
+        &:focus,
         &:focus-visible {
             border-color: $m24-color-mid-gray;
         }

From 0be570069b73bc88d4c9ea72a24613e8d8b76cf2 Mon Sep 17 00:00:00 2001
From: Craig Cook <craigcook@users.noreply.github.com>
Date: Wed, 4 Dec 2024 09:56:07 -0800
Subject: [PATCH 2/6] review fixes, add caret icons

---
 .../protocol/footer/footer-refresh.html       |  2 +-
 .../protocol/lang-switcher-refresh.html       |  2 +-
 l10n/en/footer-refresh.ftl                    |  1 +
 media/css/m24/components/footer-refresh.scss  | 23 ++++++++++---------
 .../img/icons/m24-small/down-caret-white.svg  |  3 +++
 media/img/icons/m24-small/down-caret.svg      |  3 +++
 .../img/icons/m24-small/left-caret-white.svg  |  3 +++
 media/img/icons/m24-small/left-caret.svg      |  3 +++
 .../img/icons/m24-small/right-caret-white.svg |  3 +++
 media/img/icons/m24-small/right-caret.svg     |  3 +++
 media/img/icons/m24-small/up-caret-white.svg  |  3 +++
 media/img/icons/m24-small/up-caret.svg        |  3 +++
 12 files changed, 39 insertions(+), 13 deletions(-)
 create mode 100644 media/img/icons/m24-small/down-caret-white.svg
 create mode 100644 media/img/icons/m24-small/down-caret.svg
 create mode 100644 media/img/icons/m24-small/left-caret-white.svg
 create mode 100644 media/img/icons/m24-small/left-caret.svg
 create mode 100644 media/img/icons/m24-small/right-caret-white.svg
 create mode 100644 media/img/icons/m24-small/right-caret.svg
 create mode 100644 media/img/icons/m24-small/up-caret-white.svg
 create mode 100644 media/img/icons/m24-small/up-caret.svg

diff --git a/bedrock/base/templates/includes/protocol/footer/footer-refresh.html b/bedrock/base/templates/includes/protocol/footer/footer-refresh.html
index 3bcd63f7da9..027e3135e9e 100644
--- a/bedrock/base/templates/includes/protocol/footer/footer-refresh.html
+++ b/bedrock/base/templates/includes/protocol/footer/footer-refresh.html
@@ -93,7 +93,7 @@ <h2 class="moz24-footer-heading-social">{{ ftl('footer-refresh-follow-firefox')
       <a class="moz24-footer-donate" href="{{ donate_url(location='moco-donate-footer') }}" data-link-type="button" data-link-text="Donate">
         <span class="mzp-c-button-icon-start">
           <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor">
-            <path d="M16.34 2.93c-1.26 0-2.34.46-3.2 1.03-.11.09-.57.43-.84.82h-.71c-.28-.4-.75-.75-.85-.81s-.02-.01-.03-.02h-.01c-.85-.56-1.92-1-3.16-1-3.09 0-5.6 2.57-5.6 5.73 0 1.6.52 3.26 1.55 4.94.79 1.28 1.87 2.57 3.22 3.85 2.27 2.14 4.51 3.49 4.61 3.55l.29.17h.66l.29-.17c.09-.06 2.34-1.41 4.61-3.55 1.35-1.28 2.44-2.57 3.22-3.85 1.03-1.68 1.55-3.34 1.55-4.94 0-3.16-2.51-5.73-5.6-5.73Zm-.8 12.74c-1.4 1.33-2.82 2.34-3.61 2.87-.78-.53-2.21-1.54-3.61-2.87-1.82-1.72-3.99-4.34-3.99-7.02 0-1.83 1.44-3.33 3.2-3.33.78 0 1.58.33 2.36.99.37.31.66.63.83.85s0 .01 0 .01v2.39h2.4V7.15c.18-.22.46-.53.83-.84.78-.66 1.58-.99 2.36-.99 1.76 0 3.2 1.49 3.2 3.33 0 2.68-2.17 5.29-3.99 7.02Z"/>
+            <path fill="currentColor" d="M16.34 2.93c-1.26 0-2.34.46-3.2 1.03-.11.09-.57.43-.84.82h-.71c-.28-.4-.75-.75-.85-.81s-.02-.01-.03-.02h-.01c-.85-.56-1.92-1-3.16-1-3.09 0-5.6 2.57-5.6 5.73 0 1.6.52 3.26 1.55 4.94.79 1.28 1.87 2.57 3.22 3.85 2.27 2.14 4.51 3.49 4.61 3.55l.29.17h.66l.29-.17c.09-.06 2.34-1.41 4.61-3.55 1.35-1.28 2.44-2.57 3.22-3.85 1.03-1.68 1.55-3.34 1.55-4.94 0-3.16-2.51-5.73-5.6-5.73Zm-.8 12.74c-1.4 1.33-2.82 2.34-3.61 2.87-.78-.53-2.21-1.54-3.61-2.87-1.82-1.72-3.99-4.34-3.99-7.02 0-1.83 1.44-3.33 3.2-3.33.78 0 1.58.33 2.36.99.37.31.66.63.83.85s0 .01 0 .01v2.39h2.4V7.15c.18-.22.46-.53.83-.84.78-.66 1.58-.99 2.36-.99 1.76 0 3.2 1.49 3.2 3.33 0 2.68-2.17 5.29-3.99 7.02Z"/>
           </svg>
         </span>
         <span class="mzp-c-button-icon-text">{{ ftl('footer-refresh-donate') }}</span>
diff --git a/bedrock/base/templates/includes/protocol/lang-switcher-refresh.html b/bedrock/base/templates/includes/protocol/lang-switcher-refresh.html
index 1c960da965a..23ebf3f4d1a 100644
--- a/bedrock/base/templates/includes/protocol/lang-switcher-refresh.html
+++ b/bedrock/base/templates/includes/protocol/lang-switcher-refresh.html
@@ -8,8 +8,8 @@
 
  {% if available_languages|length > 1 %}
    <form id="lang_form" class="moz24-c-language-switcher" method="get" action="#">
+    <a class="mzp-c-language-switcher-link" href="{{ url('mozorg.locales') }}">{{ ftl('footer-refresh-all-languages', fallback='footer-refresh-language') }}</a>
     <label for="page-language-select">{{ ftl('footer-refresh-language') }}</label>
-    <a class="mzp-c-language-switcher-link" href="{{ url('mozorg.locales') }}">{{ ftl('footer-refresh-language') }}</a>
      <select id="page-language-select" class="mzp-js-language-switcher-select" name="lang" dir="ltr" data-testid="footer-language-select">
        {% for code, label in available_languages|dictsort -%}
          {# Don't escape the label as it may include entity references
diff --git a/l10n/en/footer-refresh.ftl b/l10n/en/footer-refresh.ftl
index da8f698568c..98c43f215a6 100644
--- a/l10n/en/footer-refresh.ftl
+++ b/l10n/en/footer-refresh.ftl
@@ -39,6 +39,7 @@ footer-refresh-websites-cookies = Cookies
 footer-refresh-websites-legal = Legal
 footer-refresh-community-participation-guidelines = Community Participation Guidelines
 footer-refresh-about-this-site = About this site
+footer-refresh-all-languages = All languages
 footer-refresh-language = Language
 footer-refresh-primary-nav-aria-label = Footer primary
 footer-refresh-secondary-nav-aria-label = Footer secondary
diff --git a/media/css/m24/components/footer-refresh.scss b/media/css/m24/components/footer-refresh.scss
index ad0189057f2..2b976f31faa 100644
--- a/media/css/m24/components/footer-refresh.scss
+++ b/media/css/m24/components/footer-refresh.scss
@@ -263,19 +263,20 @@ $max-footer-content-width: $content-max;
         text-decoration: none;
     }
 
+    &:active,
     &:hover,
-    &:visited:hover,
     &:focus,
-    &:focus-visible,
-    &:visited:focus-visible {
+    &:focus-visible {
+        background-color: $m24-color-alt-black;
         color: $m24-color-white;
-        background-color: $m24-color-black;
-    }
 
-    &:active,
-    &:visited:active {
-        background-color: transparent;
-        box-shadow: none;
+        .mzp-c-button-icon-start path {
+            fill: $m24-color-white;
+        }
+
+        .mzp-c-button-icon-text {
+            color: $m24-color-white;
+        }
     }
 
     @media(min-width: $screen-md) {
@@ -327,7 +328,8 @@ $max-footer-content-width: $content-max;
     }
 
     .mzp-js-language-switcher-select {
-        background: $m24-color-alt-white url('/media/img/logos/mozilla/footer-refresh/icon-arrow-down.svg') 95px 9px no-repeat;
+        background: $m24-color-alt-white url('/media/img/icons/m24-small/down-caret-white.svg') 95px 0.75em no-repeat;
+        background-size: 16px 16px;
         border-radius: 0;
         border: $border-width solid transparent;
         color: $m24-color-black;
@@ -336,7 +338,6 @@ $max-footer-content-width: $content-max;
         min-width: unset;
         padding-left: 36px;
         width: 136px;
-        margin-top: 16px;
 
         &:hover,
         &:focus,
diff --git a/media/img/icons/m24-small/down-caret-white.svg b/media/img/icons/m24-small/down-caret-white.svg
new file mode 100644
index 00000000000..2fb7b96855e
--- /dev/null
+++ b/media/img/icons/m24-small/down-caret-white.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="24" height="24" viewBox="0 0 24 24">
+  <path fill="#fff" d="M12.1 18.2 2.8 9 5 6.8l7.1 7.2L19 7l2.2 2.1z"/>
+</svg>
diff --git a/media/img/icons/m24-small/down-caret.svg b/media/img/icons/m24-small/down-caret.svg
new file mode 100644
index 00000000000..a97462b6abb
--- /dev/null
+++ b/media/img/icons/m24-small/down-caret.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="24" height="24" viewBox="0 0 24 24">
+  <path d="M12.1 18.2 2.8 9 5 6.8l7.1 7.2L19 7l2.2 2.1z"/>
+</svg>
diff --git a/media/img/icons/m24-small/left-caret-white.svg b/media/img/icons/m24-small/left-caret-white.svg
new file mode 100644
index 00000000000..f42c715b212
--- /dev/null
+++ b/media/img/icons/m24-small/left-caret-white.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="24" height="24" viewBox="0 0 24 24">
+  <path fill="#fff" d="m6.3 12.1 9.3-9.3L17.7 5l-7.1 7.1 6.9 6.9-2.1 2.2z"/>
+</svg>
diff --git a/media/img/icons/m24-small/left-caret.svg b/media/img/icons/m24-small/left-caret.svg
new file mode 100644
index 00000000000..a30a1373a8b
--- /dev/null
+++ b/media/img/icons/m24-small/left-caret.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="24" height="24" viewBox="0 0 24 24">
+  <path d="m6.3 12.1 9.3-9.3L17.7 5l-7.1 7.1 6.9 6.9-2.1 2.2z"/>
+</svg>
diff --git a/media/img/icons/m24-small/right-caret-white.svg b/media/img/icons/m24-small/right-caret-white.svg
new file mode 100644
index 00000000000..34a8a304eac
--- /dev/null
+++ b/media/img/icons/m24-small/right-caret-white.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="24" height="24" viewBox="0 0 24 24">
+  <path fill="#fff" d="m17.7 12.5-9.3 9.2-2.1-2.1 7.1-7.1-6.9-7 2.1-2.1z"/>
+</svg>
diff --git a/media/img/icons/m24-small/right-caret.svg b/media/img/icons/m24-small/right-caret.svg
new file mode 100644
index 00000000000..0c5463e5c4d
--- /dev/null
+++ b/media/img/icons/m24-small/right-caret.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="24" height="24" viewBox="0 0 24 24">
+  <path d="m17.7 12.5-9.3 9.2-2.1-2.1 7.1-7.1-6.9-7 2.1-2.1z"/>
+</svg>
diff --git a/media/img/icons/m24-small/up-caret-white.svg b/media/img/icons/m24-small/up-caret-white.svg
new file mode 100644
index 00000000000..dd99a79d512
--- /dev/null
+++ b/media/img/icons/m24-small/up-caret-white.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="24" height="24" viewBox="0 0 24 24">
+  <path fill="#fff" d="m12.6 6.3 9.2 9.3-2.1 2.1-7.1-7.1-7 6.9-2.1-2.1z"/>
+</svg>
diff --git a/media/img/icons/m24-small/up-caret.svg b/media/img/icons/m24-small/up-caret.svg
new file mode 100644
index 00000000000..cfa0ac09fa0
--- /dev/null
+++ b/media/img/icons/m24-small/up-caret.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="24" height="24" viewBox="0 0 24 24">
+  <path fill="#fff" d="m11.9 6.8 9.3 9.3-2.2 2.1-7.1-7.1-6.9 7-2.2-2.2z"/>
+</svg>

From 6eddfba0f9e342629287b42ab947a07026100cc8 Mon Sep 17 00:00:00 2001
From: Craig Cook <craigcook@users.noreply.github.com>
Date: Wed, 4 Dec 2024 10:25:37 -0800
Subject: [PATCH 3/6] Clean up footer media queries [fix #15668]

---
 media/css/m24/components/footer-refresh.scss | 26 ++++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/media/css/m24/components/footer-refresh.scss b/media/css/m24/components/footer-refresh.scss
index 2b976f31faa..65abed5f246 100644
--- a/media/css/m24/components/footer-refresh.scss
+++ b/media/css/m24/components/footer-refresh.scss
@@ -40,7 +40,7 @@ $max-footer-content-width: $content-max;
     flex-direction: column;
     gap: $grid-gutter;
 
-    @media(min-width: $screen-lg) {
+    @media #{$mq-lg} {
         flex-direction: row;
         justify-content: space-between;
         align-items: flex-start;
@@ -50,7 +50,7 @@ $max-footer-content-width: $content-max;
 .moz24-footer-primary .moz24-footer-section-wrapper {
     width: 100%;
 
-    @media(min-width: $screen-lg) {
+    @media #{$mq-lg} {
         width: grid(2);
     }
 
@@ -60,7 +60,7 @@ $max-footer-content-width: $content-max;
         grid-template-columns: 1fr 1fr;
         place-items: stretch start;
 
-        @media(min-width: $screen-lg) {
+        @media #{$mq-lg} {
             width: grid(8);
             display: flex;
             flex-direction: row;
@@ -75,7 +75,7 @@ $max-footer-content-width: $content-max;
     align-items: center;
     margin-bottom: $spacer-lg;
 
-    @media(min-width: $screen-md) {
+    @media #{$mq-md} {
         flex-direction: column;
         justify-content: center;
         align-items: flex-start;
@@ -91,7 +91,7 @@ $max-footer-content-width: $content-max;
     font-size: $text-body-sm;
     font-weight: 400;
 
-    @media(min-width: $screen-md) {
+    @media #{$mq-md} {
         margin-bottom: $spacer-sm;
     }
 }
@@ -100,7 +100,7 @@ $max-footer-content-width: $content-max;
     margin: 0 0 0 $spacer-lg;
     display: flex;
 
-    @media(min-width: $screen-md) {
+    @media #{$mq-md} {
         margin: 0;
     }
 
@@ -180,7 +180,7 @@ $max-footer-content-width: $content-max;
     color: $m24-color-mid-gray;
     font-size: $text-body-sm;
     font-family: $primary-font;
-    font-weight: 500;
+    font-weight: 600;
 }
 
 .moz24-footer-primary-list {
@@ -236,7 +236,7 @@ $max-footer-content-width: $content-max;
     flex-direction: column;
     position: relative;
 
-    @media(min-width: $screen-md) {
+    @media #{$mq-md} {
         flex-direction: row;
         justify-content: space-between;
         align-items: center;
@@ -279,7 +279,7 @@ $max-footer-content-width: $content-max;
         }
     }
 
-    @media(min-width: $screen-md) {
+    @media #{$mq-md} {
         margin-bottom: 0;
     }
 }
@@ -353,7 +353,7 @@ $max-footer-content-width: $content-max;
     margin-top: $grid-margin;
     line-height: 1.5;
 
-    @media(min-width: $screen-md) {
+    @media #{$mq-md} {
         padding-top: $grid-margin;
     }
 }
@@ -364,7 +364,7 @@ $max-footer-content-width: $content-max;
     color: $m24-color-black;
     font-size: 12px;
 
-    @media(min-width: $screen-lg) {
+    @media #{$mq-lg} {
         flex-direction: row;
         justify-content: space-between;
         font-size: 14px;
@@ -374,7 +374,7 @@ $max-footer-content-width: $content-max;
 .moz24-footer-license {
     font-family: $primary-font;
 
-    @media(min-width: $screen-md) {
+    @media #{$mq-md} {
         max-width: unset;
         @include bidi(((margin-right, 10%, 0), (margin-left, 0, 10%)));
     }
@@ -393,7 +393,7 @@ $max-footer-content-width: $content-max;
         padding: 0 24px 0 0;
         margin-bottom: $spacer-xs;
 
-        @media(min-width: $screen-md) {
+        @media #{$mq-md} {
             display: inline;
         }
     }

From 28208b4e8eeeddb5c6745b367073059116702380 Mon Sep 17 00:00:00 2001
From: Craig Cook <craigcook@users.noreply.github.com>
Date: Wed, 4 Dec 2024 11:46:21 -0800
Subject: [PATCH 4/6] Fix Mozilla.ai brand term

---
 bedrock/mozorg/templates/mozorg/home/home-new.html | 2 +-
 l10n/en/brands.ftl                                 | 5 ++++-
 l10n/en/mozorg/home-new.ftl                        | 6 +++++-
 l10n/en/navigation_refresh.ftl                     | 4 +++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/bedrock/mozorg/templates/mozorg/home/home-new.html b/bedrock/mozorg/templates/mozorg/home/home-new.html
index ba55668521d..e0742804b54 100644
--- a/bedrock/mozorg/templates/mozorg/home/home-new.html
+++ b/bedrock/mozorg/templates/mozorg/home/home-new.html
@@ -257,7 +257,7 @@ <h2>{{ ftl('home-join-us-in-shaping') }}</h2>
         media_after=False
     ) %}
     <h2>{{ ftl('home-so-what-is-mozilla') }}</h2>
-    <p>{{ ftl('home-at-its-core', ventures=moz_ventures, mozai=moz_ai) }}</p>
+    <p>{{ ftl('home-at-its-core-v2', fallback='home-at-its-core', ventures=moz_ventures, mozai=moz_ai) }}</p>
     <a href="https://foundation.mozilla.org/{{ utm_params }}" rel="external noopener" class="mzp-c-button">
       {{ ftl('home-learn-about-mofo') }}
     </a>
diff --git a/l10n/en/brands.ftl b/l10n/en/brands.ftl
index d66bc11cdcc..bcf7b6b2e60 100644
--- a/l10n/en/brands.ftl
+++ b/l10n/en/brands.ftl
@@ -123,7 +123,10 @@
 -brand-name-mozilla-account = Mozilla account
 -brand-name-mozilla-accounts = Mozilla accounts
 -brand-name-mozilla-social = Mozilla.social
--brand-name-mozilla-ai = Mozilla.ai
+
+# Obsolete string (expires: 2025-01-05)
+-brand-name-mozilla-ai = Mozilla AI
+-brand-name-mozilla-ai-v2 = Mozilla.ai
 -brand-name-mozilla-ventures = Mozilla Ventures
 -brand-name-rise25 = Rise25
 -brand-name-thunderbird = Thunderbird
diff --git a/l10n/en/mozorg/home-new.ftl b/l10n/en/mozorg/home-new.ftl
index bed0a047814..752e0b3a73e 100644
--- a/l10n/en/mozorg/home-new.ftl
+++ b/l10n/en/mozorg/home-new.ftl
@@ -42,10 +42,14 @@ home-read-more = Read more
 
 home-so-what-is-mozilla = So, what is { -brand-name-mozilla }?
 
+# Obsolete string (expires: 2025-01-05)
+home-at-its-core = At its core, { -brand-name-mozilla } is an activist organization led by the { -brand-name-mozilla-foundation } that makes change in the world through a variety of ventures including { -brand-name-mozilla-corporation }, MZLA, <a {$ventures}>{ -brand-name-mozilla-ventures }</a> and <a {$mozai}>{ -brand-name-mozilla-ai-v2 }</a>. How are we different? Because we’re mission-driven, it means we have the freedom to make all of our decisions based on what’s best for the internet and for everyone online, not based on the demands of shareholders — we don’t actually have any of those.
+
 # Variables
 #   $ventures - link to https://mozilla.vc/
 #   $mozai - link to https://mozilla.ai/
-home-at-its-core = At its core, { -brand-name-mozilla } is an activist organization led by the { -brand-name-mozilla-foundation } that makes change in the world through a variety of ventures including { -brand-name-mozilla-corporation }, MZLA, <a {$ventures}>{ -brand-name-mozilla-ventures }</a> and <a {$mozai}>{ -brand-name-mozilla-ai }</a>. How are we different? Because we’re mission-driven, it means we have the freedom to make all of our decisions based on what’s best for the internet and for everyone online, not based on the demands of shareholders — we don’t actually have any of those.
+home-at-its-core-v2 = At its core, { -brand-name-mozilla } is an activist organization led by the { -brand-name-mozilla-foundation } that makes change in the world through a variety of ventures including { -brand-name-mozilla-corporation }, MZLA, <a {$ventures}>{ -brand-name-mozilla-ventures }</a> and <a {$mozai}>{ -brand-name-mozilla-ai-v2 }</a>. How are we different? Because we’re mission-driven, it means we have the freedom to make all of our decisions based on what’s best for the internet and for everyone online, not based on the demands of shareholders — we don’t actually have any of those.
+
 
 home-learn-about-mofo = Learn about the { -brand-name-mozilla-foundation }
 
diff --git a/l10n/en/navigation_refresh.ftl b/l10n/en/navigation_refresh.ftl
index f17857f796a..7050077385b 100644
--- a/l10n/en/navigation_refresh.ftl
+++ b/l10n/en/navigation_refresh.ftl
@@ -19,8 +19,10 @@ navigation-refresh-innovation-projects-v2 = Innovation Projects
 navigation-refresh-blog = Blog
 navigation-refresh-our-mission = Our Mission
 navigation-refresh-our-work = Our Work
+
+# Obsolete string (expires: 2025-01-05)
 navigation-refresh-mozilla-ai = { -brand-name-mozilla } AI
-navigation-refresh-mozilla-ai-v2 = { -brand-name-mozilla-ai }
+navigation-refresh-mozilla-ai-v2 = { -brand-name-mozilla-ai-v2 }
 navigation-refresh-mozilla-ventures = { -brand-name-mozilla } Ventures
 navigation-refresh-mozilla-ventures-v2 = { -brand-name-mozilla-ventures }
 navigation-refresh-mozilla-advertising = { -brand-name-mozilla } Advertising

From 3711dce4e0cc9fdb04c32232e81428c6b9108911 Mon Sep 17 00:00:00 2001
From: Craig Cook <craigcook@users.noreply.github.com>
Date: Wed, 4 Dec 2024 12:08:10 -0800
Subject: [PATCH 5/6] Fix newsletter media queries

---
 .../css/m24/components/footer-newsletter.scss | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/media/css/m24/components/footer-newsletter.scss b/media/css/m24/components/footer-newsletter.scss
index fc4bb13be2b..910b74bf4e1 100644
--- a/media/css/m24/components/footer-newsletter.scss
+++ b/media/css/m24/components/footer-newsletter.scss
@@ -35,7 +35,7 @@ $max-footer-content-width: $content-max;
         padding-bottom: $spacer-lg;
         position: relative;
 
-        @media(min-width: $screen-md) {
+        @media #{$mq-md} {
             align-items: flex-start;
             flex-direction: row;
         }
@@ -48,11 +48,11 @@ $max-footer-content-width: $content-max;
         align-items: flex-start;
         margin-bottom: $grid-margin;
 
-        @media(min-width: $screen-md) {
+        @media #{$mq-md} {
             width: grid(5);
         }
 
-        @media(min-width: $screen-lg) {
+        @media #{$mq-lg} {
             width: grid(4);
             flex-wrap: nowrap;
         }
@@ -71,7 +71,7 @@ $max-footer-content-width: $content-max;
         @include bidi(((margin-right, $spacer-sm, 0), (margin-left, 0, $spacer-sm)));
         margin-bottom: $spacer-md;
 
-        @media(min-width: $screen-lg) {
+        @media #{$mq-lg} {
             @include bidi(((margin-right, $spacer-xl, 0), (margin-left, 0, $spacer-xl)));
         }
 
@@ -82,11 +82,11 @@ $max-footer-content-width: $content-max;
     .moz24-newsletter {
         width: 100%;
 
-        @media(min-width: $screen-md) {
+        @media #{$mq-md} {
             width: grid(6);
         }
 
-        @media(min-width: $screen-lg) {
+        @media #{$mq-lg} {
             width: grid(8);
         }
 
@@ -126,7 +126,7 @@ $max-footer-content-width: $content-max;
             font-family: $primary-font;
             text-align: start;
 
-            @media(min-width: $screen-lg) {
+            @media #{$mq-lg} {
                 display: inline-grid;
 
                 &:first-of-type {
@@ -167,7 +167,7 @@ $max-footer-content-width: $content-max;
             width: 100%;
             font-family: $primary-font;
 
-            @media(min-width: $screen-md) {
+            @media #{$mq-md} {
                 min-width: 100%;
             }
 
@@ -184,7 +184,7 @@ $max-footer-content-width: $content-max;
             background-image: url('/media/img/logos/mozilla/footer-refresh/icon-arrow-down.svg');
             background-repeat: no-repeat;
 
-            @media(min-width: $screen-lg) {
+            @media #{$mq-lg} {
                 min-width: 100%;
             }
         }
@@ -193,7 +193,7 @@ $max-footer-content-width: $content-max;
     .mzp-c-newsletter-details-inner {
         max-width: 100%;
 
-        @media(min-width: $screen-lg) {
+        @media #{$mq-lg} {
             display: grid;
             grid-template-columns: 1fr 1fr;
             grid-template-rows: 30px 45px 75px;
@@ -207,7 +207,7 @@ $max-footer-content-width: $content-max;
             font-family: $primary-font;
             text-align: start;
 
-            @media(min-width: $screen-lg) {
+            @media #{$mq-lg} {
                 display: inline-grid;
 
                 &:first-of-type {
@@ -224,7 +224,7 @@ $max-footer-content-width: $content-max;
             &:has(> label.mzp-u-inline) {
                 margin: $spacer-lg 0 $spacer-md;
 
-                @media(min-width: $screen-lg) {
+                @media #{$mq-lg} {
                     grid-column-start: 1;
                     grid-column-end: 3;
                 }
@@ -273,7 +273,7 @@ $max-footer-content-width: $content-max;
                 color: $m24-color-black;
             }
 
-            @media(min-width: $screen-md) {
+            @media #{$mq-md} {
                 width: fit-content;
                 display: flex;
                 justify-content: flex-start;

From 82ca1961ab1d2c8c1505bb345a6ec825c872b120 Mon Sep 17 00:00:00 2001
From: Craig Cook <craigcook@users.noreply.github.com>
Date: Wed, 4 Dec 2024 12:12:51 -0800
Subject: [PATCH 6/6] Re-fix Mozilla.ai string

---
 .../protocol/navigation/menus-refresh/about-us.html       | 2 +-
 l10n/en/mozorg/home-new.ftl                               | 2 +-
 l10n/en/navigation_refresh.ftl                            | 8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/bedrock/base/templates/includes/protocol/navigation/menus-refresh/about-us.html b/bedrock/base/templates/includes/protocol/navigation/menus-refresh/about-us.html
index 4410fe745df..ef20e36f6ad 100644
--- a/bedrock/base/templates/includes/protocol/navigation/menus-refresh/about-us.html
+++ b/bedrock/base/templates/includes/protocol/navigation/menus-refresh/about-us.html
@@ -65,7 +65,7 @@ <h4 class="m24-c-menu-item-title">{{ ftl('navigation-refresh-mozilla-foundation'
             <li>
               <section class="m24-c-menu-item">
                 <a class="m24-c-menu-item-link" href="https://www.mozilla.ai/?{{ utm_params }}" data-link-text="Mozilla.ai" data-link-position="topnav - about">
-                  <h4 class="m24-c-menu-item-title">{{ ftl('navigation-refresh-mozilla-ai-v2') }}</h4>
+                  <h4 class="m24-c-menu-item-title">{{ ftl('navigation-refresh-mozilla-ai-v3') }}</h4>
                 </a>
               </section>
             </li>
diff --git a/l10n/en/mozorg/home-new.ftl b/l10n/en/mozorg/home-new.ftl
index 752e0b3a73e..92a7bb30458 100644
--- a/l10n/en/mozorg/home-new.ftl
+++ b/l10n/en/mozorg/home-new.ftl
@@ -43,7 +43,7 @@ home-read-more = Read more
 home-so-what-is-mozilla = So, what is { -brand-name-mozilla }?
 
 # Obsolete string (expires: 2025-01-05)
-home-at-its-core = At its core, { -brand-name-mozilla } is an activist organization led by the { -brand-name-mozilla-foundation } that makes change in the world through a variety of ventures including { -brand-name-mozilla-corporation }, MZLA, <a {$ventures}>{ -brand-name-mozilla-ventures }</a> and <a {$mozai}>{ -brand-name-mozilla-ai-v2 }</a>. How are we different? Because we’re mission-driven, it means we have the freedom to make all of our decisions based on what’s best for the internet and for everyone online, not based on the demands of shareholders — we don’t actually have any of those.
+home-at-its-core = At its core, { -brand-name-mozilla } is an activist organization led by the { -brand-name-mozilla-foundation } that makes change in the world through a variety of ventures including { -brand-name-mozilla-corporation }, MZLA, <a {$ventures}>{ -brand-name-mozilla-ventures }</a> and <a {$mozai}>{ -brand-name-mozilla-ai }</a>. How are we different? Because we’re mission-driven, it means we have the freedom to make all of our decisions based on what’s best for the internet and for everyone online, not based on the demands of shareholders — we don’t actually have any of those.
 
 # Variables
 #   $ventures - link to https://mozilla.vc/
diff --git a/l10n/en/navigation_refresh.ftl b/l10n/en/navigation_refresh.ftl
index 7050077385b..ecf6e726741 100644
--- a/l10n/en/navigation_refresh.ftl
+++ b/l10n/en/navigation_refresh.ftl
@@ -22,7 +22,13 @@ navigation-refresh-our-work = Our Work
 
 # Obsolete string (expires: 2025-01-05)
 navigation-refresh-mozilla-ai = { -brand-name-mozilla } AI
-navigation-refresh-mozilla-ai-v2 = { -brand-name-mozilla-ai-v2 }
+
+# Obsolete string (expires: 2025-01-05)
+navigation-refresh-mozilla-ai-v2 = { -brand-name-mozilla-ai }
+
+navigation-refresh-mozilla-ai-v3 = { -brand-name-mozilla-ai-v2 }
+
+# Obsolete string (expires: 2025-01-05)
 navigation-refresh-mozilla-ventures = { -brand-name-mozilla } Ventures
 navigation-refresh-mozilla-ventures-v2 = { -brand-name-mozilla-ventures }
 navigation-refresh-mozilla-advertising = { -brand-name-mozilla } Advertising