diff --git a/app/src/main/java/no/naiv/tilfluktsrom/MainActivity.kt b/app/src/main/java/no/naiv/tilfluktsrom/MainActivity.kt
index 0b88d87..a91e249 100644
--- a/app/src/main/java/no/naiv/tilfluktsrom/MainActivity.kt
+++ b/app/src/main/java/no/naiv/tilfluktsrom/MainActivity.kt
@@ -489,7 +489,11 @@ class MainActivity : AppCompatActivity(), SensorEventListener {
     /** Update all UI elements for the currently selected shelter. */
     private fun updateSelectedShelterUI() {
         val selected = selectedShelter ?: return
-        val distanceText = DistanceUtils.formatDistance(selected.distanceMeters)
+        val distanceText = if (selected.distanceMeters.isNaN()) {
+            getString(R.string.status_no_location)
+        } else {
+            DistanceUtils.formatDistance(selected.distanceMeters)
+        }
 
         // Update bottom sheet
         binding.selectedShelterAddress.text = selected.shelter.adresse
@@ -829,9 +833,7 @@ class MainActivity : AppCompatActivity(), SensorEventListener {
                     Log.w(TAG, "Compass accuracy degraded: $accuracy")
                     binding.compassAddressText.let { tv ->
                         val current = selectedShelter?.shelter?.adresse ?: ""
-                        if (!current.contains("⚠")) {
-                            tv.text = "⚠ $current"
-                        }
+                        tv.text = getString(R.string.compass_accuracy_warning, current)
                     }
                 }
                 SensorManager.SENSOR_STATUS_ACCURACY_MEDIUM,
diff --git a/app/src/main/java/no/naiv/tilfluktsrom/ui/ShelterListAdapter.kt b/app/src/main/java/no/naiv/tilfluktsrom/ui/ShelterListAdapter.kt
index 55655f2..41e09ca 100644
--- a/app/src/main/java/no/naiv/tilfluktsrom/ui/ShelterListAdapter.kt
+++ b/app/src/main/java/no/naiv/tilfluktsrom/ui/ShelterListAdapter.kt
@@ -52,6 +52,13 @@ class ShelterListAdapter(
                 R.string.shelter_room_nr, item.shelter.romnr
             )
 
+            binding.root.contentDescription = ctx.getString(
+                R.string.content_desc_shelter_item,
+                item.shelter.adresse,
+                DistanceUtils.formatDistance(item.distanceMeters),
+                item.shelter.plasser
+            )
+
             binding.root.isSelected = isSelected
             binding.root.alpha = if (isSelected) 1.0f else 0.7f
 
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 48ccd18..6277398 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -64,6 +64,8 @@
 
     <!-- Tilgjengelighet -->
     <string name="direction_arrow_description">Retning til tilfluktsrom, %s unna</string>
+    <string name="content_desc_shelter_item">%1$s, %2$s, %3$d plasser</string>
+    <string name="compass_accuracy_warning">Upresist kompass - %s</string>
 
     <!-- Sivilforsvar -->
     <string name="action_civil_defense_info">Sivilforsvarsinformasjon</string>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index 9a8f085..2669d8e 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -64,6 +64,8 @@
 
     <!-- Tilgjenge -->
     <string name="direction_arrow_description">Retning til tilfluktsrom, %s unna</string>
+    <string name="content_desc_shelter_item">%1$s, %2$s, %3$d plassar</string>
+    <string name="compass_accuracy_warning">Upresis kompass - %s</string>
 
     <!-- Sivilforsvar -->
     <string name="action_civil_defense_info">Sivilforsvarsinformasjon</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 03e0e04..c0897aa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -64,6 +64,8 @@
 
     <!-- Accessibility -->
     <string name="direction_arrow_description">Direction to shelter, %s away</string>
+    <string name="content_desc_shelter_item">%1$s, %2$s, %3$d places</string>
+    <string name="compass_accuracy_warning">Low accuracy - %s</string>
 
     <!-- Civil defense info -->
     <string name="action_civil_defense_info">Civil defense information</string>