diff --git a/frontend/public/locales/de/backend.json5 b/frontend/public/locales/de/backend.json5
index 2404c195..641ded19 100644
--- a/frontend/public/locales/de/backend.json5
+++ b/frontend/public/locales/de/backend.json5
@@ -1,31 +1,31 @@
 {
   'infection-states': {
-    Infected: 'Infiziert',
-    Hospitalized: 'Hospitalisiert',
-    ICU: 'Intensivpatient',
-    Dead: 'Verstorben',
-    Exposed: 'Kontaktperson',
-    Recovered: 'Genesen',
-    Carrier: 'Träger',
-    Susceptible: 'Empfänglich',
-    InfectedT: 'Infiziert (🧪)',
-    InfectedTV1: 'Infiziert (🧪 + 💉)',
-    InfectedTV2: 'Infiziert (🧪 + 💉💉)',
-    InfectedV1: 'Infiziert (💉)',
-    InfectedV2: 'Infiziert (💉💉)',
-    HospitalizedV1: 'Hospitalisiert (💉)',
-    HospitalizedV2: 'Hospitalisiert (💉💉)',
-    ICUV1: 'Intensivpatient (💉)',
-    ICUV2: 'Intensivpatient (💉💉)',
-    ExposedV1: 'Kontaktperson (💉)',
-    ExposedV2: 'Kontaktperson (💉💉)',
-    CarrierT: 'Träger (🧪)',
-    CarrierTV1: 'Träger (🧪 + 💉)',
-    CarrierTV2: 'Träger (🧪 + 💉💉)',
-    CarrierV1: 'Träger (💉)',
-    CarrierV2: 'Träger (💉💉)',
-    SusceptibleV1: 'Empfänglich (💉)',
-    SusceptibleV2: 'Empfänglich (💉💉)',
+    Infected: 'Symptomatische',
+    Hospitalized: 'Hospitalisierte',
+    ICU: 'Intensivpatienten',
+    Dead: 'Todesfälle',
+    Exposed: 'Präinfektiöse',
+    Recovered: 'Genesene',
+    Carrier: 'Nichtsymptomatische',
+    Susceptible: 'Empfängliche',
+    InfectedT: 'Symptomatische \n (🧪)',
+    InfectedTV1: 'Symptomatische \n (🧪 + 💉)',
+    InfectedTV2: 'Symptomatische \n (🧪 + 💉💉)',
+    InfectedV1: 'Symptomatische \n (💉)',
+    InfectedV2: 'Symptomatische \n (💉💉)',
+    HospitalizedV1: 'Hospitalisierte \n (💉)',
+    HospitalizedV2: 'Hospitalisierte \n (💉💉)',
+    ICUV1: 'Intensivpatienten \n (💉)',
+    ICUV2: 'Intensivpatienten \n (💉💉)',
+    ExposedV1: 'Präinfektiöse \n (💉)',
+    ExposedV2: 'Präinfektiöse \n (💉💉)',
+    CarrierT: 'Nichtsymptomatische \n (🧪)',
+    CarrierTV1: 'Nichtsymptomatische \n (🧪 + 💉)',
+    CarrierTV2: 'Nichtsymptomatische \n (🧪 + 💉💉)',
+    CarrierV1: 'Nichtsymptomatische \n (💉)',
+    CarrierV2: 'Nichtsymptomatische \n (💉💉)',
+    SusceptibleV1: 'Empfängliche \n (💉)',
+    SusceptibleV2: 'Empfängliche \n (💉💉)',
   },
   'scenario-names': {
     'Summer 2021 Simulation 1': 'Szenario ohne Maßnahmen',
diff --git a/frontend/public/locales/en/backend.json5 b/frontend/public/locales/en/backend.json5
index 21e3efd3..932165d1 100644
--- a/frontend/public/locales/en/backend.json5
+++ b/frontend/public/locales/en/backend.json5
@@ -1,31 +1,31 @@
 {
   'infection-states': {
-    Infected: 'Infected',
+    Infected: 'Symptomatic',
     Hospitalized: 'Hospitalized',
     ICU: 'Intensive Care',
     Dead: 'Dead',
     Exposed: 'Exposed',
     Recovered: 'Recovered',
-    Carrier: 'Carrier',
+    Carrier: 'Non-Symptomatic',
     Susceptible: 'Susceptible',
-    InfectedT: 'Infected (🧪)',
-    InfectedTV1: 'Infected (🧪 + 💉)',
-    InfectedTV2: 'Infected (🧪 + 💉💉)',
-    InfectedV1: 'Infected (💉)',
-    InfectedV2: 'Infected (💉💉)',
-    HospitalizedV1: 'Hospitalized (💉)',
-    HospitalizedV2: 'Hospitalized (💉💉)',
-    ICUV1: 'Intensive Care (💉)',
-    ICUV2: 'Intensive Care (💉💉)',
-    ExposedV1: 'Exposed (💉)',
-    ExposedV2: 'Exposed (💉💉)',
-    CarrierT: 'Carrier (🧪)',
-    CarrierTV1: 'Carrier (🧪 + 💉)',
-    CarrierTV2: 'Carrier (🧪 + 💉💉)',
-    CarrierV1: 'Carrier (💉)',
-    CarrierV2: 'Carrier (💉💉)',
-    SusceptibleV1: 'Susceptible (💉)',
-    SusceptibleV2: 'Susceptible (💉💉)',
+    InfectedT: 'Symptomatic \n (🧪)',
+    InfectedTV1: 'Symptomatic \n (🧪 + 💉)',
+    InfectedTV2: 'Symptomatic \n (🧪 + 💉💉)',
+    InfectedV1: 'Symptomatic \n (💉)',
+    InfectedV2: 'Symptomatic \n (💉💉)',
+    HospitalizedV1: 'Hospitalized \n (💉)',
+    HospitalizedV2: 'Hospitalized \n (💉💉)',
+    ICUV1: 'Intensive Care \n (💉)',
+    ICUV2: 'Intensive Care \n (💉💉)',
+    ExposedV1: 'Exposed \n (💉)',
+    ExposedV2: 'Exposed \n (💉💉)',
+    CarrierT: 'Non-Symptomatic \n (🧪)',
+    CarrierTV1: 'Non-Symptomatic \n (🧪 + 💉)',
+    CarrierTV2: 'Non-Symptomatic \n (🧪 + 💉💉)',
+    CarrierV1: 'Non-Symptomatic \n (💉)',
+    CarrierV2: 'Non-Symptomatic \n (💉💉)',
+    SusceptibleV1: 'Susceptible \n (💉)',
+    SusceptibleV2: 'Susceptible \n (💉💉)',
   },
   'scenario-names': {
     'Summer 2021 Simulation 1': 'Scenario without Interventions',
diff --git a/frontend/src/components/Scenario.tsx b/frontend/src/components/Scenario.tsx
index 1a81f349..caa57133 100644
--- a/frontend/src/components/Scenario.tsx
+++ b/frontend/src/components/Scenario.tsx
@@ -226,6 +226,7 @@ export default function Scenario(): JSX.Element {
                 <ListItemButton
                   key={compartment}
                   sx={{
+                    whiteSpace: 'pre-line',
                     display: compartmentsExpanded || i < 4 ? 'flex' : 'none',
                     maxHeight: '36px', // Ensure, that emojis don't screw with the line height!
                     padding: theme.spacing(1),
diff --git a/frontend/src/components/Sidebar/DistrictMap.tsx b/frontend/src/components/Sidebar/DistrictMap.tsx
index dd0f50ba..40fff375 100644
--- a/frontend/src/components/Sidebar/DistrictMap.tsx
+++ b/frontend/src/components/Sidebar/DistrictMap.tsx
@@ -248,7 +248,8 @@ export default function DistrictMap(): JSX.Element {
                 selectedScenario && selectedCompartment
                   ? `${t(`BEZ.${regionData.BEZ}`)} {GEN}\n${tBackend(
                       `infection-states.${selectedCompartment}`
-                    )}: ${formatNumber(regionData.value)}`
+                      // replace ' \n ' sequence for compartments that have glyphs with ' '
+                    ).replace(/ \n /g, ' ')}: ${formatNumber(regionData.value)}`
                   : `${t(`BEZ.${regionData.BEZ}`)} {GEN}`,
               fill: fillColor,
             });