diff --git a/crowdin.yml b/crowdin.yml
index 63961c0e0be..dd9fe693aba 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -3,22 +3,30 @@ commit_message: "skip-build"
 pull_request_assignees:
   - joostdecock
 files:
+  # Markdown
   - source: /markdown/org/**/en.md
     translation: /markdown/org/**/%two_letters_code%.md
+  # YAML
   - source: /sites/org/pages/*/*.en.yaml
     translation: /sites/org/pages/*/%file_name%.%two_letters_code%.yaml
+    translation_replace: &noen
+      ".en": ""
   - source: /sites/org/pages/**/*.en.yaml
     translation: /sites/org/pages/**/%file_name%.%two_letters_code%.yaml
-  - source: /sites/org/components/*/*.en.yaml
-    translation: /sites/org/components/*/%file_name%.%two_letters_code%.yaml
+    translation_replace: *noen
   - source: /sites/org/components/**/*.en.yaml
     translation: /sites/org/components/**/%file_name%.%two_letters_code%.yaml
+    translation_replace: *noen
   - source: /sites/shared/components/**/*.en.yaml
     translation: /sites/shared/components/**/%file_name%.%two_letters_code%.yaml
+    translation_replace: *noen
   - source: /sites/shared/i18n/*.en.yaml
     translation: /sites/shared/i18n/%file_name%.%two_letters_code%.yaml
+    translation_replace: *noen
   - source: /sites/backend/src/**/*.en.yaml
     translation: /sites/backend/src/**/%file_name%.%two_letters_code%.yaml
+    translation_replace: *noen
+  # JSON
   - source: /sites/shared/jargon/en.json
     translation: /sites/shared/jargon/%two_letters_code%.json
   - source: /designs/*/i18n/en.json
diff --git a/sites/shared/components/modal/locale-picker.mjs b/sites/shared/components/modal/locale-picker.mjs
index 3bee7970284..0dd9a7766e8 100644
--- a/sites/shared/components/modal/locale-picker.mjs
+++ b/sites/shared/components/modal/locale-picker.mjs
@@ -26,6 +26,7 @@ const translations = {
 export const ModalLocalePicker = () => {
   const { t } = useTranslation(ns)
   const router = useRouter()
+  const current = router.locale
 
   return (
     <ModalWrapper>
@@ -38,7 +39,7 @@ export const ModalLocalePicker = () => {
             }
             key={locale}
             locale={locale}
-            className="btn btn-lg btn-primary grow"
+            className={`btn lg:btn-lg grow ${current === locale ? 'btn-neutral' : 'btn-primary'}`}
           >
             <span>{t(locale)}</span>
             <span className="grow"></span>
diff --git a/sites/shared/components/modal/theme-picker.mjs b/sites/shared/components/modal/theme-picker.mjs
index 5f2082ad4b0..6278cb8b133 100644
--- a/sites/shared/components/modal/theme-picker.mjs
+++ b/sites/shared/components/modal/theme-picker.mjs
@@ -22,8 +22,8 @@ export const ModalThemePicker = ({ app, iconOnly = false, bottom = false }) => {
               className="btn btn-lg grow bg-base-100 border border-base-200 border-solid text-base-content hover:bg-primary hover:text-primary-content hover:border-primary shadow hover:shadow-lg"
             >
               {t(`${theme}Theme`)}
-              <span className="grow"></span>
-              <div className="flex flex-shrink-0 flex-wrap gap-1 items-center">
+              <span className="hidden lg:block lg:grow"></span>
+              <div className="flex flex-shrink-0 flex-wrap gap-1 items-center hidden lg:flex">
                 {['primary', 'secondary', 'accent', 'neutral'].map((color) => (
                   <div key={color} className={`bg-${color} w-8 h-8 rounded-full border-2 `}></div>
                 ))}
diff --git a/sites/shared/components/wrappers/modal.mjs b/sites/shared/components/wrappers/modal.mjs
index 99a7acf7597..2338b813edd 100644
--- a/sites/shared/components/wrappers/modal.mjs
+++ b/sites/shared/components/wrappers/modal.mjs
@@ -68,7 +68,7 @@ export const ModalWrapper = ({
         children
       ) : (
         <div
-          className={`bg-base-100 p-4 lg:px-8 lg:rounded-lg lg:shadow-lg max-h-full overflow-auto grow`}
+          className={`bg-base-100 p-4 lg:px-8 lg:rounded-lg lg:shadow-lg max-h-full overflow-auto`}
         >
           {children}
         </div>