diff --git a/oeffi/res/layout/action_bar.xml b/oeffi/res/layout/action_bar.xml
index 65441bd..f092ed2 100644
--- a/oeffi/res/layout/action_bar.xml
+++ b/oeffi/res/layout/action_bar.xml
@@ -37,8 +37,8 @@
         android:gravity="center_vertical"
         android:minHeight="@dimen/action_bar_height"
         android:orientation="vertical"
-        android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
-        android:paddingRight="@dimen/list_entry_padding_horizontal_cram">
+        android:paddingLeft="@dimen/text_padding_horizontal_lax"
+        android:paddingRight="@dimen/text_padding_horizontal_cram">
 
         <TextView
             android:id="@+id/action_bar_primary_title"
diff --git a/oeffi/res/layout/create_launcher_shortcut_dialog.xml b/oeffi/res/layout/create_launcher_shortcut_dialog.xml
index ee2da94..7a1e8f3 100644
--- a/oeffi/res/layout/create_launcher_shortcut_dialog.xml
+++ b/oeffi/res/layout/create_launcher_shortcut_dialog.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:paddingBottom="@dimen/list_entry_padding_vertical_lax"
-    android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
-    android:paddingRight="@dimen/list_entry_padding_horizontal_lax"
-    android:paddingTop="@dimen/list_entry_padding_vertical_lax">
+    android:paddingBottom="@dimen/text_padding_vertical_lax"
+    android:paddingLeft="@dimen/text_padding_horizontal_lax"
+    android:paddingRight="@dimen/text_padding_horizontal_lax"
+    android:paddingTop="@dimen/text_padding_vertical_lax">
 
     <EditText
         android:id="@+id/create_launcher_shortcut_dialog_name"
diff --git a/oeffi/res/layout/directions_content.xml b/oeffi/res/layout/directions_content.xml
index 2c73213..389ab1b 100644
--- a/oeffi/res/layout/directions_content.xml
+++ b/oeffi/res/layout/directions_content.xml
@@ -27,10 +27,10 @@
                 android:background="@color/bg_action_bar_appendix"
                 android:drawableLeft="@drawable/ic_portable_wifi_off_grey600_24dp"
                 android:gravity="center"
-                android:paddingBottom="@dimen/list_entry_padding_vertical"
-                android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
-                android:paddingRight="@dimen/list_entry_padding_horizontal_verylax"
-                android:paddingTop="@dimen/list_entry_padding_vertical"
+                android:paddingBottom="@dimen/text_padding_vertical"
+                android:paddingLeft="@dimen/text_padding_horizontal_lax"
+                android:paddingRight="@dimen/text_padding_horizontal_verylax"
+                android:paddingTop="@dimen/text_padding_vertical"
                 android:text="@string/directions_connectivity_warning"
                 android:visibility="gone" />
 
@@ -115,8 +115,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|left"
-            android:layout_marginBottom="@dimen/list_entry_padding_vertical"
-            android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
+            android:layout_marginBottom="@dimen/text_padding_vertical"
+            android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
             android:textSize="@dimen/font_size_disclaimer"
             android:textColor="@color/fg_significant_on_light" />
 
diff --git a/oeffi/res/layout/directions_form_include.xml b/oeffi/res/layout/directions_form_include.xml
index 0961901..83651a9 100644
--- a/oeffi/res/layout/directions_form_include.xml
+++ b/oeffi/res/layout/directions_form_include.xml
@@ -44,8 +44,8 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/list_entry_padding_horizontal"
-            android:paddingRight="@dimen/list_entry_padding_horizontal"
+            android:paddingLeft="@dimen/text_padding_horizontal"
+            android:paddingRight="@dimen/text_padding_horizontal"
             android:minHeight="@dimen/action_bar_button_width"
             android:orientation="horizontal">
 
@@ -136,10 +136,10 @@
         android:id="@+id/directions_option_bike"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/list_entry_padding_vertical_lax"
-        android:layout_marginLeft="@dimen/list_entry_padding_horizontal_lax"
-        android:layout_marginRight="@dimen/list_entry_padding_horizontal_lax"
-        android:layout_marginTop="@dimen/list_entry_padding_vertical_lax"
+        android:layout_marginBottom="@dimen/text_padding_vertical_lax"
+        android:layout_marginLeft="@dimen/text_padding_horizontal_lax"
+        android:layout_marginRight="@dimen/text_padding_horizontal_lax"
+        android:layout_marginTop="@dimen/text_padding_vertical_lax"
         android:text="@string/directions_option_bike"
         android:visibility="gone" />
 
@@ -162,24 +162,24 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/directions_time_arr_dep_description"
-                android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
-                android:paddingRight="@dimen/list_entry_padding_horizontal_lax"
+                android:paddingLeft="@dimen/text_padding_horizontal_lax"
+                android:paddingRight="@dimen/text_padding_horizontal_lax"
                 android:singleLine="true" />
 
             <Button
                 android:id="@+id/directions_time_1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
-                android:paddingRight="@dimen/list_entry_padding_horizontal_lax"
+                android:paddingLeft="@dimen/text_padding_horizontal_lax"
+                android:paddingRight="@dimen/text_padding_horizontal_lax"
                 android:singleLine="true" />
 
             <Button
                 android:id="@+id/directions_time_2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
-                android:paddingRight="@dimen/list_entry_padding_horizontal_lax"
+                android:paddingLeft="@dimen/text_padding_horizontal_lax"
+                android:paddingRight="@dimen/text_padding_horizontal_lax"
                 android:singleLine="true" />
 
             <!-- stretch dummy -->
@@ -196,8 +196,8 @@
                 android:layout_gravity="right"
                 android:ellipsize="none"
                 android:minWidth="96dp"
-                android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
-                android:paddingRight="@dimen/list_entry_padding_horizontal_lax"
+                android:paddingLeft="@dimen/text_padding_horizontal_lax"
+                android:paddingRight="@dimen/text_padding_horizontal_lax"
                 android:singleLine="true"
                 android:text="@string/directions_go"
                 android:textStyle="bold" />
diff --git a/oeffi/res/layout/directions_location_dropdown_entry.xml b/oeffi/res/layout/directions_location_dropdown_entry.xml
index 7f4ea45..b42b0e1 100644
--- a/oeffi/res/layout/directions_location_dropdown_entry.xml
+++ b/oeffi/res/layout/directions_location_dropdown_entry.xml
@@ -5,9 +5,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/bg_level0"
-    android:drawablePadding="@dimen/list_entry_padding_horizontal_lax"
+    android:drawablePadding="@dimen/text_padding_horizontal_lax"
     android:drawableTint="@color/fg_less_significant"
     android:minHeight="52dp"
-    android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax"
-    android:paddingRight="@dimen/list_entry_padding_horizontal"
+    android:paddingLeft="@dimen/text_padding_horizontal_verylax"
+    android:paddingRight="@dimen/text_padding_horizontal"
     android:textSize="@dimen/font_size_large" />
diff --git a/oeffi/res/layout/directions_map_pin.xml b/oeffi/res/layout/directions_map_pin.xml
index eb26496..86fa911 100644
--- a/oeffi/res/layout/directions_map_pin.xml
+++ b/oeffi/res/layout/directions_map_pin.xml
@@ -15,9 +15,9 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:gravity="left"
-        android:paddingBottom="@dimen/list_entry_padding_vertical"
-        android:paddingLeft="@dimen/list_entry_padding_horizontal"
-        android:paddingRight="@dimen/list_entry_padding_horizontal"
+        android:paddingBottom="@dimen/text_padding_vertical"
+        android:paddingLeft="@dimen/text_padding_horizontal"
+        android:paddingRight="@dimen/text_padding_horizontal"
         android:textColor="@color/fg_significant_on_light" />
 
     <LinearLayout
@@ -33,8 +33,8 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:minHeight="42dp"
-            android:paddingLeft="@dimen/list_entry_padding_horizontal_cram"
-            android:paddingRight="@dimen/list_entry_padding_horizontal_cram"
+            android:paddingLeft="@dimen/text_padding_horizontal_cram"
+            android:paddingRight="@dimen/text_padding_horizontal_cram"
             android:singleLine="true"
             android:text="@string/directions_map_pin_button_from"
             android:textColor="@color/fg_significant_on_light" />
@@ -45,8 +45,8 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:minHeight="42dp"
-            android:paddingLeft="@dimen/list_entry_padding_horizontal_cram"
-            android:paddingRight="@dimen/list_entry_padding_horizontal_cram"
+            android:paddingLeft="@dimen/text_padding_horizontal_cram"
+            android:paddingRight="@dimen/text_padding_horizontal_cram"
             android:singleLine="true"
             android:text="@string/directions_map_pin_button_to"
             android:textColor="@color/fg_significant_on_light" />
diff --git a/oeffi/res/layout/directions_query_history_entry.xml b/oeffi/res/layout/directions_query_history_entry.xml
index ce350ab..6696322 100644
--- a/oeffi/res/layout/directions_query_history_entry.xml
+++ b/oeffi/res/layout/directions_query_history_entry.xml
@@ -25,23 +25,23 @@
                 android:id="@+id/directions_query_history_entry_from"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:drawablePadding="@dimen/list_entry_padding_horizontal_lax"
+                android:drawablePadding="@dimen/text_padding_horizontal_lax"
                 android:drawableTint="@color/fg_less_significant"
                 android:gravity="center_vertical"
-                android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax"
-                android:paddingRight="@dimen/list_entry_padding_horizontal_cram"
-                android:paddingTop="@dimen/list_entry_padding_vertical_verylax" />
+                android:paddingLeft="@dimen/text_padding_horizontal_verylax"
+                android:paddingRight="@dimen/text_padding_horizontal_cram"
+                android:paddingTop="@dimen/text_padding_vertical_verylax" />
 
             <de.schildbach.oeffi.directions.LocationTextView
                 android:id="@+id/directions_query_history_entry_to"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:drawablePadding="@dimen/list_entry_padding_horizontal_lax"
+                android:drawablePadding="@dimen/text_padding_horizontal_lax"
                 android:drawableTint="@color/fg_less_significant"
                 android:gravity="center_vertical"
-                android:paddingBottom="@dimen/list_entry_padding_vertical_verylax"
-                android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax"
-                android:paddingRight="@dimen/list_entry_padding_horizontal_cram" />
+                android:paddingBottom="@dimen/text_padding_vertical_verylax"
+                android:paddingLeft="@dimen/text_padding_horizontal_verylax"
+                android:paddingRight="@dimen/text_padding_horizontal_cram" />
         </LinearLayout>
 
         <Button
@@ -51,11 +51,11 @@
             android:layout_gravity="center"
             android:layout_weight="2"
             android:drawableLeft="@drawable/ic_beenhere_grey600_24dp"
-            android:drawablePadding="@dimen/list_entry_padding_horizontal_lax"
+            android:drawablePadding="@dimen/text_padding_horizontal_lax"
             android:drawableTint="@color/fg_less_significant"
             android:gravity="left|center_vertical"
-            android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
-            android:paddingRight="@dimen/list_entry_padding_horizontal_cram" />
+            android:paddingLeft="@dimen/text_padding_horizontal_lax"
+            android:paddingRight="@dimen/text_padding_horizontal_cram" />
     </LinearLayout>
 
     <TextView
diff --git a/oeffi/res/layout/directions_trip_details_content.xml b/oeffi/res/layout/directions_trip_details_content.xml
index 9dc84c6..2448fb5 100644
--- a/oeffi/res/layout/directions_trip_details_content.xml
+++ b/oeffi/res/layout/directions_trip_details_content.xml
@@ -39,24 +39,24 @@
                         android:layout_height="wrap_content"
                         android:background="@color/bg_divider"
                         android:orientation="horizontal"
-                        android:paddingBottom="@dimen/list_entry_padding_vertical_lax"
-                        android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
-                        android:paddingRight="@dimen/list_entry_padding_horizontal_lax"
-                        android:paddingTop="@dimen/list_entry_padding_vertical_lax">
+                        android:paddingBottom="@dimen/text_padding_vertical_lax"
+                        android:paddingLeft="@dimen/text_padding_horizontal_lax"
+                        android:paddingRight="@dimen/text_padding_horizontal_lax"
+                        android:paddingTop="@dimen/text_padding_vertical_lax">
 
                         <de.schildbach.oeffi.directions.LocationTextView
                             android:id="@+id/directions_trip_details_location_from"
                             android:layout_width="0px"
                             android:layout_height="match_parent"
                             android:layout_weight="50"
-                            android:drawablePadding="@dimen/list_entry_padding_horizontal_lax" />
+                            android:drawablePadding="@dimen/text_padding_horizontal_lax" />
 
                         <de.schildbach.oeffi.directions.LocationTextView
                             android:id="@+id/directions_trip_details_location_to"
                             android:layout_width="0px"
                             android:layout_height="match_parent"
                             android:layout_weight="50"
-                            android:drawablePadding="@dimen/list_entry_padding_horizontal_lax" />
+                            android:drawablePadding="@dimen/text_padding_horizontal_lax" />
                     </LinearLayout>
 
                     <TableLayout
@@ -65,10 +65,10 @@
                         android:layout_height="wrap_content"
                         android:background="@color/bg_divider"
                         android:baselineAligned="true"
-                        android:paddingBottom="@dimen/list_entry_padding_vertical_lax"
-                        android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax"
-                        android:paddingRight="@dimen/list_entry_padding_horizontal_verylax"
-                        android:paddingTop="@dimen/list_entry_padding_vertical_lax"
+                        android:paddingBottom="@dimen/text_padding_vertical_lax"
+                        android:paddingLeft="@dimen/text_padding_horizontal_verylax"
+                        android:paddingRight="@dimen/text_padding_horizontal_verylax"
+                        android:paddingTop="@dimen/text_padding_vertical_lax"
                         android:stretchColumns="2" />
 
                     <TextView
@@ -76,13 +76,13 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:drawableLeft="@drawable/ic_settings_input_antenna_grey600_18dp"
-                        android:drawablePadding="@dimen/list_entry_padding_horizontal_lax"
+                        android:drawablePadding="@dimen/text_padding_horizontal_lax"
                         android:drawableTint="@color/fg_less_significant"
                         android:gravity="left|center_vertical"
-                        android:paddingBottom="@dimen/list_entry_padding_vertical_lax"
-                        android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
-                        android:paddingRight="@dimen/list_entry_padding_horizontal_lax"
-                        android:paddingTop="@dimen/list_entry_padding_vertical_verylax" />
+                        android:paddingBottom="@dimen/text_padding_vertical_lax"
+                        android:paddingLeft="@dimen/text_padding_horizontal_lax"
+                        android:paddingRight="@dimen/text_padding_horizontal_lax"
+                        android:paddingTop="@dimen/text_padding_vertical_verylax" />
                 </LinearLayout>
             </ScrollView>
 
@@ -91,10 +91,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom"
-                android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
-                android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax"
-                android:layout_marginTop="@dimen/list_entry_padding_vertical"
-                android:layout_marginBottom="@dimen/list_entry_padding_vertical"
+                android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
+                android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
+                android:layout_marginTop="@dimen/text_padding_vertical"
+                android:layout_marginBottom="@dimen/text_padding_vertical"
                 android:baselineAligned="false"
                 android:orientation="horizontal">
 
@@ -104,7 +104,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="bottom"
                     android:layout_weight="1"
-                    android:drawablePadding="@dimen/list_entry_padding_horizontal_lax"
+                    android:drawablePadding="@dimen/text_padding_horizontal_lax"
                     android:gravity="bottom|left"
                     android:maxLines="2"
                     android:textSize="@dimen/font_size_disclaimer" />
@@ -137,8 +137,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|left"
-            android:layout_marginBottom="@dimen/list_entry_padding_vertical"
-            android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
+            android:layout_marginBottom="@dimen/text_padding_vertical"
+            android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
             android:textSize="@dimen/font_size_disclaimer"
             android:textColor="@color/fg_significant_on_light" />
     </FrameLayout>
diff --git a/oeffi/res/layout/directions_trip_details_fares_row.xml b/oeffi/res/layout/directions_trip_details_fares_row.xml
index 07c2df4..82c61bb 100644
--- a/oeffi/res/layout/directions_trip_details_fares_row.xml
+++ b/oeffi/res/layout/directions_trip_details_fares_row.xml
@@ -9,19 +9,19 @@
 
     <TextView
         android:id="@+id/directions_trip_details_fare_entry_row_name"
-        android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
+        android:paddingLeft="@dimen/text_padding_horizontal_lax"
         android:textSize="@dimen/font_size_normal" />
 
     <TextView
         android:id="@+id/directions_trip_details_fare_entry_row_fare"
         android:gravity="right"
-        android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
+        android:paddingLeft="@dimen/text_padding_horizontal_lax"
         android:textSize="@dimen/font_size_normal"
         android:textStyle="bold" />
 
     <TextView
         android:id="@+id/directions_trip_details_fare_entry_row_unit"
-        android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
+        android:paddingLeft="@dimen/text_padding_horizontal_lax"
         android:textSize="@dimen/font_size_normal" />
 
 </TableRow>
diff --git a/oeffi/res/layout/directions_trip_details_individual_entry.xml b/oeffi/res/layout/directions_trip_details_individual_entry.xml
index b4d3767..a84d554 100644
--- a/oeffi/res/layout/directions_trip_details_individual_entry.xml
+++ b/oeffi/res/layout/directions_trip_details_individual_entry.xml
@@ -5,16 +5,16 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:paddingLeft="@dimen/list_entry_padding_horizontal_lax">
+    android:paddingLeft="@dimen/text_padding_horizontal_lax">
 
     <TextView
         android:id="@+id/directions_trip_details_individual_entry_text"
         android:layout_width="0px"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/list_entry_padding_vertical_lax"
-        android:layout_marginTop="@dimen/list_entry_padding_vertical_lax"
+        android:layout_marginBottom="@dimen/text_padding_vertical_lax"
+        android:layout_marginTop="@dimen/text_padding_vertical_lax"
         android:layout_weight="1"
-        android:drawablePadding="@dimen/list_entry_padding_horizontal_cram"
+        android:drawablePadding="@dimen/text_padding_horizontal_cram"
         android:textSize="@dimen/font_size_large" />
 
     <ImageButton
diff --git a/oeffi/res/layout/directions_trip_details_public_entry.xml b/oeffi/res/layout/directions_trip_details_public_entry.xml
index 7730687..9087ef2 100644
--- a/oeffi/res/layout/directions_trip_details_public_entry.xml
+++ b/oeffi/res/layout/directions_trip_details_public_entry.xml
@@ -10,7 +10,7 @@
         style="?android:attr/buttonBarStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/list_entry_padding_horizontal_lax"
+        android:layout_marginLeft="@dimen/text_padding_horizontal_lax"
         android:orientation="horizontal">
 
         <LinearLayout
@@ -19,7 +19,7 @@
             android:layout_weight="1"
             android:baselineAligned="true"
             android:orientation="horizontal"
-            android:paddingBottom="@dimen/list_entry_padding_vertical_lax"
+            android:paddingBottom="@dimen/text_padding_vertical_lax"
             android:paddingTop="6dp">
 
             <de.schildbach.oeffi.stations.LineView
@@ -35,13 +35,13 @@
                 android:layout_weight="1"
                 android:orientation="vertical"
                 android:paddingBottom="4dp"
-                android:paddingLeft="@dimen/list_entry_padding_horizontal_lax">
+                android:paddingLeft="@dimen/text_padding_horizontal_lax">
 
                 <TextView
                     android:id="@+id/directions_trip_details_public_entry_destination"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:drawablePadding="@dimen/list_entry_padding_horizontal"
+                    android:drawablePadding="@dimen/text_padding_horizontal"
                     android:textColor="@color/fg_significant"
                     android:textSize="@dimen/font_size_large" />
 
@@ -50,7 +50,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:drawableLeft="@drawable/ic_accessible_grey600_18dp"
-                    android:drawablePadding="@dimen/list_entry_padding_horizontal"
+                    android:drawablePadding="@dimen/text_padding_horizontal"
                     android:text="@string/directions_trip_details_public_entry_accessibility"
                     android:textColor="@color/fg_insignificant"
                     android:visibility="gone" />
@@ -60,7 +60,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:drawableLeft="@drawable/ic_directions_bike_grey600_18dp"
-                    android:drawablePadding="@dimen/list_entry_padding_horizontal"
+                    android:drawablePadding="@dimen/text_padding_horizontal"
                     android:text="@string/directions_trip_details_public_entry_bicycle_carriage"
                     android:textColor="@color/fg_insignificant"
                     android:visibility="gone" />
@@ -80,8 +80,8 @@
         android:id="@+id/directions_trip_details_public_entry_stops"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/list_entry_padding_horizontal_lax"
-        android:layout_marginRight="@dimen/list_entry_padding_horizontal_lax"
+        android:layout_marginLeft="@dimen/text_padding_horizontal_lax"
+        android:layout_marginRight="@dimen/text_padding_horizontal_lax"
         android:baselineAligned="true"
         android:shrinkColumns="5"
         android:stretchColumns="5" />
@@ -90,9 +90,9 @@
         android:id="@+id/directions_trip_details_public_entry_message"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/list_entry_padding_horizontal_lax"
-        android:layout_marginRight="@dimen/list_entry_padding_horizontal_lax"
-        android:layout_marginTop="@dimen/list_entry_padding_vertical_lax"
+        android:layout_marginLeft="@dimen/text_padding_horizontal_lax"
+        android:layout_marginRight="@dimen/text_padding_horizontal_lax"
+        android:layout_marginTop="@dimen/text_padding_vertical_lax"
         android:textSize="@dimen/font_size_tiny"
         android:visibility="gone" />
 
diff --git a/oeffi/res/layout/directions_trip_details_public_entry_collapsed.xml b/oeffi/res/layout/directions_trip_details_public_entry_collapsed.xml
index 6abfee2..f83c005 100644
--- a/oeffi/res/layout/directions_trip_details_public_entry_collapsed.xml
+++ b/oeffi/res/layout/directions_trip_details_public_entry_collapsed.xml
@@ -19,7 +19,7 @@
 
     <TextView
         android:id="@+id/directions_trip_details_public_entry_collapsed_message"
-        android:layout_marginLeft="@dimen/list_entry_padding_horizontal_lax"
+        android:layout_marginLeft="@dimen/text_padding_horizontal_lax"
         android:textColor="@color/fg_significant"
         android:textSize="@dimen/font_size_large" />
 
diff --git a/oeffi/res/layout/directions_trip_details_public_entry_stop.xml b/oeffi/res/layout/directions_trip_details_public_entry_stop.xml
index 753d372..cc2ecb5 100644
--- a/oeffi/res/layout/directions_trip_details_public_entry_stop.xml
+++ b/oeffi/res/layout/directions_trip_details_public_entry_stop.xml
@@ -10,27 +10,27 @@
 
     <TextView
         android:id="@+id/directions_trip_details_public_entry_stop_date"
-        android:layout_marginLeft="@dimen/list_entry_padding_horizontal_cram"
-        android:layout_marginRight="@dimen/list_entry_padding_horizontal_cram"
+        android:layout_marginLeft="@dimen/text_padding_horizontal_cram"
+        android:layout_marginRight="@dimen/text_padding_horizontal_cram"
         android:maxWidth="128dp"
         android:textColor="@color/fg_significant"
         android:textSize="@dimen/font_size_large" />
 
     <TextView
         android:id="@+id/directions_trip_details_public_entry_stop_time"
-        android:layout_marginLeft="@dimen/list_entry_padding_horizontal_cram"
+        android:layout_marginLeft="@dimen/text_padding_horizontal_cram"
         android:textColor="@color/fg_significant"
         android:textSize="@dimen/font_size_large" />
 
     <TextView
         android:id="@+id/directions_trip_details_public_entry_stop_delay"
-        android:layout_marginLeft="@dimen/list_entry_padding_horizontal"
+        android:layout_marginLeft="@dimen/text_padding_horizontal"
         android:textColor="@color/fg_significant"
         android:textSize="@dimen/font_size_large" />
 
     <TextView
         android:id="@+id/directions_trip_details_public_entry_stop_position"
-        android:layout_marginLeft="@dimen/list_entry_padding_horizontal_lax"
+        android:layout_marginLeft="@dimen/text_padding_horizontal_lax"
         android:ellipsize="none"
         android:gravity="center_horizontal"
         android:includeFontPadding="false"
@@ -41,7 +41,7 @@
 
     <TextView
         android:id="@+id/directions_trip_details_public_entry_stop_name"
-        android:layout_marginLeft="@dimen/list_entry_padding_horizontal_lax"
+        android:layout_marginLeft="@dimen/text_padding_horizontal_lax"
         android:background="?android:attr/selectableItemBackground"
         android:textColor="@color/fg_significant"
         android:textSize="@dimen/font_size_large" />
diff --git a/oeffi/res/layout/directions_trip_overview_content.xml b/oeffi/res/layout/directions_trip_overview_content.xml
index 1182670..d05398c 100644
--- a/oeffi/res/layout/directions_trip_overview_content.xml
+++ b/oeffi/res/layout/directions_trip_overview_content.xml
@@ -23,10 +23,10 @@
             android:id="@+id/directions_trip_overview_disclaimer_group"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
-            android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax"
-            android:layout_marginTop="@dimen/list_entry_padding_vertical"
-            android:layout_marginBottom="@dimen/list_entry_padding_vertical">
+            android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
+            android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
+            android:layout_marginTop="@dimen/text_padding_vertical"
+            android:layout_marginBottom="@dimen/text_padding_vertical">
 
             <TextView
                 android:id="@+id/trips_server_product"
diff --git a/oeffi/res/layout/favorites_content.xml b/oeffi/res/layout/favorites_content.xml
index 86d872e..22874a8 100644
--- a/oeffi/res/layout/favorites_content.xml
+++ b/oeffi/res/layout/favorites_content.xml
@@ -22,8 +22,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
-            android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax"
+            android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
+            android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
             android:gravity="center"
             android:text="@string/stations_favorite_stations_no_content_message"
             android:textSize="@dimen/font_size_large" />
diff --git a/oeffi/res/layout/favorites_list_entry.xml b/oeffi/res/layout/favorites_list_entry.xml
index eaff9cc..24117ab 100644
--- a/oeffi/res/layout/favorites_list_entry.xml
+++ b/oeffi/res/layout/favorites_list_entry.xml
@@ -13,10 +13,10 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:orientation="vertical"
-        android:paddingBottom="@dimen/list_entry_padding_vertical_verylax"
-        android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax"
-        android:paddingRight="@dimen/list_entry_padding_horizontal_verylax"
-        android:paddingTop="@dimen/list_entry_padding_vertical_verylax">
+        android:paddingBottom="@dimen/text_padding_vertical_verylax"
+        android:paddingLeft="@dimen/text_padding_horizontal_verylax"
+        android:paddingRight="@dimen/text_padding_horizontal_verylax"
+        android:paddingTop="@dimen/text_padding_vertical_verylax">
 
         <TextView
             android:id="@+id/favorites_list_entry_network"
@@ -27,13 +27,13 @@
             android:id="@+id/favorites_list_entry_place"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/list_entry_padding_vertical_cram" />
+            android:layout_marginTop="@dimen/text_padding_vertical_cram" />
 
         <TextView
             android:id="@+id/favorites_list_entry_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/list_entry_padding_vertical_cram"
+            android:layout_marginTop="@dimen/text_padding_vertical_cram"
             android:textStyle="bold" />
     </LinearLayout>
 
diff --git a/oeffi/res/layout/hint_dialog.xml b/oeffi/res/layout/hint_dialog.xml
index 2252bd3..ea28c95 100644
--- a/oeffi/res/layout/hint_dialog.xml
+++ b/oeffi/res/layout/hint_dialog.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:paddingBottom="@dimen/list_entry_padding_vertical_lax"
-    android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
-    android:paddingRight="@dimen/list_entry_padding_horizontal_lax"
-    android:paddingTop="@dimen/list_entry_padding_vertical_lax">
+    android:paddingBottom="@dimen/text_padding_vertical_lax"
+    android:paddingLeft="@dimen/text_padding_horizontal_lax"
+    android:paddingRight="@dimen/text_padding_horizontal_lax"
+    android:paddingTop="@dimen/text_padding_vertical_lax">
 
     <WebView
         android:id="@+id/hint_dialog_webview"
diff --git a/oeffi/res/layout/navigation_drawer.xml b/oeffi/res/layout/navigation_drawer.xml
index be6217f..3ee4188 100644
--- a/oeffi/res/layout/navigation_drawer.xml
+++ b/oeffi/res/layout/navigation_drawer.xml
@@ -17,8 +17,8 @@
         android:id="@+id/navigation_drawer_footer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/list_entry_padding_vertical_verylax"
-        android:layout_marginTop="@dimen/list_entry_padding_vertical_verylax"
+        android:layout_marginBottom="@dimen/text_padding_vertical_verylax"
+        android:layout_marginTop="@dimen/text_padding_vertical_verylax"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
@@ -26,14 +26,14 @@
             android:id="@+id/navigation_drawer_footer_heart"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
+            android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
             android:src="@drawable/ic_favorite_border_grey600_24dp" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
-            android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax"
+            android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
+            android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
             android:text="@string/navigation_drawer_message"
             android:textColor="#888"
             android:textSize="@dimen/font_size_small" />
diff --git a/oeffi/res/layout/navigation_drawer_entry.xml b/oeffi/res/layout/navigation_drawer_entry.xml
index 44b602d..424fb61 100644
--- a/oeffi/res/layout/navigation_drawer_entry.xml
+++ b/oeffi/res/layout/navigation_drawer_entry.xml
@@ -11,17 +11,17 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:paddingBottom="@dimen/list_entry_padding_vertical_verylax"
-        android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax"
+        android:paddingBottom="@dimen/text_padding_vertical_verylax"
+        android:paddingLeft="@dimen/text_padding_horizontal_verylax"
         android:paddingRight="0px"
-        android:paddingTop="@dimen/list_entry_padding_vertical_verylax">
+        android:paddingTop="@dimen/text_padding_vertical_verylax">
 
         <ImageView
             android:id="@+id/navigation_drawer_entry_icon"
             android:layout_width="36dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginRight="@dimen/list_entry_padding_horizontal_lax"
+            android:layout_marginRight="@dimen/text_padding_horizontal_lax"
             android:scaleType="fitCenter" />
 
         <LinearLayout
diff --git a/oeffi/res/layout/network_picker_content.xml b/oeffi/res/layout/network_picker_content.xml
index 4c03ce6..911fa7e 100644
--- a/oeffi/res/layout/network_picker_content.xml
+++ b/oeffi/res/layout/network_picker_content.xml
@@ -26,10 +26,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/bg_action_bar_appendix"
-                android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax"
-                android:paddingRight="@dimen/list_entry_padding_horizontal_verylax"
-                android:paddingTop="@dimen/list_entry_padding_vertical_verylax"
-                android:paddingBottom="@dimen/list_entry_padding_vertical_verylax"
+                android:paddingLeft="@dimen/text_padding_horizontal_verylax"
+                android:paddingRight="@dimen/text_padding_horizontal_verylax"
+                android:paddingTop="@dimen/text_padding_vertical_verylax"
+                android:paddingBottom="@dimen/text_padding_vertical_verylax"
                 android:text="@string/network_picker_firsttime_message"
                 android:textColor="@color/fg_significant"
                 android:textSize="@dimen/font_size_large"
@@ -61,8 +61,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|left"
-            android:layout_marginBottom="@dimen/list_entry_padding_vertical"
-            android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
+            android:layout_marginBottom="@dimen/text_padding_vertical"
+            android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
             android:textSize="@dimen/font_size_disclaimer"
             android:textColor="@color/fg_significant_on_light" />
     </FrameLayout>
diff --git a/oeffi/res/layout/network_picker_entry.xml b/oeffi/res/layout/network_picker_entry.xml
index 1922511..9892f95 100644
--- a/oeffi/res/layout/network_picker_entry.xml
+++ b/oeffi/res/layout/network_picker_entry.xml
@@ -11,16 +11,16 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/list_entry_padding_vertical_verylax"
-        android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax"
-        android:paddingRight="@dimen/list_entry_padding_horizontal_verylax"
-        android:paddingTop="@dimen/list_entry_padding_vertical_verylax">
+        android:paddingBottom="@dimen/text_padding_vertical_verylax"
+        android:paddingLeft="@dimen/text_padding_horizontal_verylax"
+        android:paddingRight="@dimen/text_padding_horizontal_verylax"
+        android:paddingTop="@dimen/text_padding_vertical_verylax">
 
         <ImageView
             android:id="@+id/network_picker_entry_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="@dimen/list_entry_padding_horizontal_lax"
+            android:layout_marginRight="@dimen/text_padding_horizontal_lax"
             android:scaleType="center" />
 
         <Space
@@ -58,9 +58,9 @@
             android:layout_alignParentBottom="true"
             android:layout_alignParentRight="true"
             android:layout_below="@id/network_picker_entry_label"
-            android:layout_marginLeft="@dimen/list_entry_padding_horizontal_lax"
+            android:layout_marginLeft="@dimen/text_padding_horizontal_lax"
             android:drawableLeft="@drawable/ic_beenhere_grey600_24dp"
-            android:drawablePadding="@dimen/list_entry_padding_horizontal"
+            android:drawablePadding="@dimen/text_padding_horizontal"
             android:gravity="left" />
 
         <TextView
diff --git a/oeffi/res/layout/network_picker_separator.xml b/oeffi/res/layout/network_picker_separator.xml
index f7d15e9..ebb56ba 100644
--- a/oeffi/res/layout/network_picker_separator.xml
+++ b/oeffi/res/layout/network_picker_separator.xml
@@ -6,9 +6,9 @@
     android:layout_height="wrap_content"
     android:background="@color/bg_divider"
     android:focusable="false"
-    android:paddingBottom="@dimen/list_entry_padding_vertical_cram"
-    android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax"
-    android:paddingRight="@dimen/list_entry_padding_horizontal_lax"
-    android:paddingTop="@dimen/list_entry_padding_vertical_cram"
+    android:paddingBottom="@dimen/text_padding_vertical_cram"
+    android:paddingLeft="@dimen/text_padding_horizontal_verylax"
+    android:paddingRight="@dimen/text_padding_horizontal_lax"
+    android:paddingTop="@dimen/text_padding_vertical_cram"
     android:textColor="@color/fg_less_significant"
     android:textStyle="bold" />
diff --git a/oeffi/res/layout/plans_content.xml b/oeffi/res/layout/plans_content.xml
index 09a1a05..cf96dae 100644
--- a/oeffi/res/layout/plans_content.xml
+++ b/oeffi/res/layout/plans_content.xml
@@ -70,10 +70,10 @@
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
-            android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax"
-            android:layout_marginTop="@dimen/list_entry_padding_vertical_lax"
-            android:layout_marginBottom="@dimen/list_entry_padding_vertical_lax"
+            android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
+            android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
+            android:layout_marginTop="@dimen/text_padding_vertical_lax"
+            android:layout_marginBottom="@dimen/text_padding_vertical_lax"
             android:fitsSystemWindows="true">
 
             <de.schildbach.oeffi.util.ZoomControls
diff --git a/oeffi/res/layout/plans_picker_content.xml b/oeffi/res/layout/plans_picker_content.xml
index fad3e7d..ca3bac8 100644
--- a/oeffi/res/layout/plans_picker_content.xml
+++ b/oeffi/res/layout/plans_picker_content.xml
@@ -25,10 +25,10 @@
                 android:background="@color/bg_action_bar_appendix"
                 android:drawableLeft="@drawable/ic_portable_wifi_off_grey600_24dp"
                 android:gravity="center"
-                android:paddingBottom="@dimen/list_entry_padding_vertical"
-                android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
-                android:paddingRight="@dimen/list_entry_padding_horizontal_verylax"
-                android:paddingTop="@dimen/list_entry_padding_vertical"
+                android:paddingBottom="@dimen/text_padding_vertical"
+                android:paddingLeft="@dimen/text_padding_horizontal_lax"
+                android:paddingRight="@dimen/text_padding_horizontal_verylax"
+                android:paddingTop="@dimen/text_padding_vertical"
                 android:text="@string/plans_picker_connectivity_warning"
                 android:visibility="gone" />
 
@@ -48,11 +48,11 @@
                     android:layout_weight="1"
                     android:drawableLeft="@drawable/ic_search_grey600_24dp"
                     android:drawableTint="@color/fg_significant"
-                    android:drawablePadding="@dimen/list_entry_padding_horizontal"
+                    android:drawablePadding="@dimen/text_padding_horizontal"
                     android:gravity="left|center_vertical"
-                    android:paddingBottom="@dimen/list_entry_padding_vertical"
-                    android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
-                    android:paddingTop="@dimen/list_entry_padding_vertical"
+                    android:paddingBottom="@dimen/text_padding_vertical"
+                    android:paddingLeft="@dimen/text_padding_horizontal_lax"
+                    android:paddingTop="@dimen/text_padding_vertical"
                     android:singleLine="true"
                     android:textSize="@dimen/font_size_large"
                     android:textStyle="bold" />
diff --git a/oeffi/res/layout/plans_picker_entry.xml b/oeffi/res/layout/plans_picker_entry.xml
index 277983a..9aad50a 100644
--- a/oeffi/res/layout/plans_picker_entry.xml
+++ b/oeffi/res/layout/plans_picker_entry.xml
@@ -11,10 +11,10 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/list_entry_padding_vertical_verylax"
-        android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax"
-        android:paddingRight="@dimen/list_entry_padding_horizontal_verylax"
-        android:paddingTop="@dimen/list_entry_padding_vertical_verylax">
+        android:paddingBottom="@dimen/text_padding_vertical_verylax"
+        android:paddingLeft="@dimen/text_padding_horizontal_verylax"
+        android:paddingRight="@dimen/text_padding_horizontal_verylax"
+        android:paddingTop="@dimen/text_padding_vertical_verylax">
 
         <FrameLayout
             android:id="@+id/plans_picker_entry_image"
@@ -22,7 +22,7 @@
             android:layout_height="86dp"
             android:layout_alignParentLeft="true"
             android:layout_alignParentTop="true"
-            android:layout_marginRight="@dimen/list_entry_padding_horizontal_lax"
+            android:layout_marginRight="@dimen/text_padding_horizontal_lax"
             android:padding="2dp">
 
             <ImageView
@@ -53,8 +53,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
-            android:layout_marginLeft="@dimen/list_entry_padding_horizontal_lax"
-            android:layout_marginTop="@dimen/list_entry_padding_vertical_lax"
+            android:layout_marginLeft="@dimen/text_padding_horizontal_lax"
+            android:layout_marginTop="@dimen/text_padding_vertical_lax"
             android:layout_toLeftOf="@id/plans_picker_entry_context_button_space"
             android:src="@drawable/ic_offline_pin_grey600_24dp"
             android:tint="@color/fg_less_significant" />
@@ -66,7 +66,7 @@
             android:layout_alignParentTop="true"
             android:layout_toLeftOf="@id/plans_picker_entry_loaded"
             android:layout_toRightOf="@id/plans_picker_entry_image"
-            android:paddingTop="@dimen/list_entry_padding_vertical_lax"
+            android:paddingTop="@dimen/text_padding_vertical_lax"
             android:textSize="@dimen/font_size_large"
             android:textStyle="bold" />
 
@@ -79,8 +79,8 @@
             android:layout_below="@id/plans_picker_entry_name"
             android:layout_marginLeft="6dp"
             android:gravity="right"
-            android:paddingBottom="@dimen/list_entry_padding_vertical_lax"
-            android:paddingTop="@dimen/list_entry_padding_vertical_lax"
+            android:paddingBottom="@dimen/text_padding_vertical_lax"
+            android:paddingTop="@dimen/text_padding_vertical_lax"
             android:textColor="@color/fg_less_significant" />
 
         <ImageView
@@ -89,8 +89,8 @@
             android:layout_height="26dp"
             android:layout_alignParentBottom="true"
             android:layout_toRightOf="@id/plans_picker_entry_image"
-            android:paddingBottom="@dimen/list_entry_padding_vertical_lax"
-            android:paddingRight="@dimen/list_entry_padding_horizontal" />
+            android:paddingBottom="@dimen/text_padding_vertical_lax"
+            android:paddingRight="@dimen/text_padding_horizontal" />
 
         <TextView
             android:id="@+id/plans_picker_entry_disclaimer"
@@ -101,8 +101,8 @@
             android:layout_toLeftOf="@id/plans_picker_entry_valid_from"
             android:layout_toRightOf="@id/plans_picker_entry_network_logo"
             android:maxLines="2"
-            android:paddingBottom="@dimen/list_entry_padding_vertical_lax"
-            android:paddingTop="@dimen/list_entry_padding_vertical_lax"
+            android:paddingBottom="@dimen/text_padding_vertical_lax"
+            android:paddingTop="@dimen/text_padding_vertical_lax"
             android:textColor="@color/fg_less_significant" />
     </RelativeLayout>
 
diff --git a/oeffi/res/layout/station_widget_content.xml b/oeffi/res/layout/station_widget_content.xml
index 88cdf19..e388415 100644
--- a/oeffi/res/layout/station_widget_content.xml
+++ b/oeffi/res/layout/station_widget_content.xml
@@ -12,8 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
-        android:paddingRight="@dimen/list_entry_padding_horizontal_lax">
+        android:paddingLeft="@dimen/text_padding_horizontal_lax"
+        android:paddingRight="@dimen/text_padding_horizontal_lax">
 
         <TextView
             android:id="@+id/station_widget_distance"
@@ -52,7 +52,7 @@
         android:layout_width="match_parent"
         android:layout_height="0px"
         android:layout_weight="1"
-        android:paddingBottom="@dimen/list_entry_padding_vertical">
+        android:paddingBottom="@dimen/text_padding_vertical">
 
         <ListView
             android:id="@+id/station_widget_departures"
diff --git a/oeffi/res/layout/station_widget_entry.xml b/oeffi/res/layout/station_widget_entry.xml
index d8ccfcf..741ba81 100644
--- a/oeffi/res/layout/station_widget_entry.xml
+++ b/oeffi/res/layout/station_widget_entry.xml
@@ -7,8 +7,8 @@
     android:layout_height="wrap_content"
     android:baselineAligned="true"
     android:orientation="horizontal"
-    android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
-    android:paddingRight="@dimen/list_entry_padding_horizontal_lax">
+    android:paddingLeft="@dimen/text_padding_horizontal_lax"
+    android:paddingRight="@dimen/text_padding_horizontal_lax">
 
     <TextView
         android:id="@+id/station_widget_entry_line"
@@ -16,8 +16,8 @@
         android:layout_height="wrap_content"
         android:layout_margin="2dp"
         android:background="@color/bg_divider"
-        android:paddingLeft="@dimen/list_entry_padding_horizontal"
-        android:paddingRight="@dimen/list_entry_padding_horizontal"
+        android:paddingLeft="@dimen/text_padding_horizontal"
+        android:paddingRight="@dimen/text_padding_horizontal"
         android:textColor="@color/fg_significant_darkdefault"
         android:textStyle="bold" />
 
@@ -37,8 +37,8 @@
         android:layout_height="wrap_content"
         android:layout_margin="2dp"
         android:background="@color/bg_highlighted_darkdefault"
-        android:paddingLeft="@dimen/list_entry_padding_horizontal"
-        android:paddingRight="@dimen/list_entry_padding_horizontal"
+        android:paddingLeft="@dimen/text_padding_horizontal"
+        android:paddingRight="@dimen/text_padding_horizontal"
         android:singleLine="true"
         android:text="!"
         android:textColor="@color/fg_significant_darkdefault"
@@ -52,8 +52,8 @@
         android:layout_height="wrap_content"
         android:layout_margin="2dp"
         android:background="@color/bg_position_darkdefault"
-        android:paddingLeft="@dimen/list_entry_padding_horizontal"
-        android:paddingRight="@dimen/list_entry_padding_horizontal"
+        android:paddingLeft="@dimen/text_padding_horizontal"
+        android:paddingRight="@dimen/text_padding_horizontal"
         android:singleLine="true"
         android:textColor="@color/bg_level0_darkdefault"
         android:textStyle="bold"
diff --git a/oeffi/res/layout/stations_content.xml b/oeffi/res/layout/stations_content.xml
index 0bc3fd6..e7a8424 100644
--- a/oeffi/res/layout/stations_content.xml
+++ b/oeffi/res/layout/stations_content.xml
@@ -36,10 +36,10 @@
                         android:background="@color/bg_action_bar_appendix"
                         android:drawableLeft="@drawable/ic_portable_wifi_off_grey600_24dp"
                         android:gravity="center"
-                        android:paddingBottom="@dimen/list_entry_padding_vertical"
-                        android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
-                        android:paddingRight="@dimen/list_entry_padding_horizontal_verylax"
-                        android:paddingTop="@dimen/list_entry_padding_vertical"
+                        android:paddingBottom="@dimen/text_padding_vertical"
+                        android:paddingLeft="@dimen/text_padding_horizontal_lax"
+                        android:paddingRight="@dimen/text_padding_horizontal_verylax"
+                        android:paddingTop="@dimen/text_padding_vertical"
                         android:text="@string/stations_connectivity_warning"
                         android:visibility="gone" />
 
@@ -59,11 +59,11 @@
                             android:layout_weight="1"
                             android:drawableLeft="@drawable/ic_search_grey600_24dp"
                             android:drawableTint="@color/fg_significant"
-                            android:drawablePadding="@dimen/list_entry_padding_horizontal"
+                            android:drawablePadding="@dimen/text_padding_horizontal"
                             android:gravity="left|center_vertical"
-                            android:paddingBottom="@dimen/list_entry_padding_vertical"
-                            android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
-                            android:paddingTop="@dimen/list_entry_padding_vertical"
+                            android:paddingBottom="@dimen/text_padding_vertical"
+                            android:paddingLeft="@dimen/text_padding_horizontal_lax"
+                            android:paddingTop="@dimen/text_padding_vertical"
                             android:singleLine="true"
                             android:textSize="@dimen/font_size_large"
                             android:textStyle="bold" />
@@ -92,11 +92,11 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:drawableLeft="@drawable/ic_location_searching_grey600_24dp"
-                            android:drawablePadding="@dimen/list_entry_padding_horizontal"
+                            android:drawablePadding="@dimen/text_padding_horizontal"
                             android:gravity="left|center_vertical"
-                            android:paddingBottom="@dimen/list_entry_padding_vertical"
-                            android:paddingLeft="@dimen/list_entry_padding_horizontal_lax"
-                            android:paddingTop="@dimen/list_entry_padding_vertical"
+                            android:paddingBottom="@dimen/text_padding_vertical"
+                            android:paddingLeft="@dimen/text_padding_horizontal_lax"
+                            android:paddingTop="@dimen/text_padding_vertical"
                             android:singleLine="true"
                             android:textSize="@dimen/font_size_large"
                             android:textStyle="bold" />
@@ -128,8 +128,8 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
-                            android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
-                            android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax"
+                            android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
+                            android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
                             android:gravity="center_horizontal"
                             android:orientation="vertical">
 
@@ -147,7 +147,7 @@
                                 style="@style/My.Widget.Button.Border"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/list_entry_padding_vertical_verylax"
+                                android:layout_marginTop="@dimen/text_padding_vertical_verylax"
                                 android:text="@string/stations_list_network_settings" />
                         </LinearLayout>
 
@@ -157,8 +157,8 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
-                            android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
-                            android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax"
+                            android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
+                            android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
                             android:gravity="center_horizontal"
                             android:orientation="vertical">
 
@@ -175,7 +175,7 @@
                                 style="@style/My.Widget.Button.Border"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/list_entry_padding_vertical_verylax"
+                                android:layout_marginTop="@dimen/text_padding_vertical_verylax"
                                 android:text="@string/stations_location_permission_request" />
                         </LinearLayout>
 
@@ -185,8 +185,8 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
-                            android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
-                            android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax"
+                            android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
+                            android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
                             android:gravity="center_horizontal"
                             android:orientation="vertical">
 
@@ -201,7 +201,7 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/list_entry_padding_vertical_lax"
+                                android:layout_marginTop="@dimen/text_padding_vertical_lax"
                                 android:gravity="center"
                                 android:maxWidth="256dp"
                                 android:text="@string/stations_list_cannot_acquire_location_hint" />
@@ -211,7 +211,7 @@
                                 style="@style/My.Widget.Button.Border"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/list_entry_padding_vertical_verylax"
+                                android:layout_marginTop="@dimen/text_padding_vertical_verylax"
                                 android:text="@string/stations_list_location_settings" />
                         </LinearLayout>
 
@@ -221,8 +221,8 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
-                            android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
-                            android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax"
+                            android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
+                            android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
                             android:gravity="center_horizontal"
                             android:orientation="vertical">
 
@@ -234,7 +234,7 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/list_entry_padding_vertical_verylax"
+                                android:layout_marginTop="@dimen/text_padding_vertical_verylax"
                                 android:gravity="center"
                                 android:maxWidth="256dp"
                                 android:text="@string/stations_list_acquiring_location"
@@ -244,7 +244,7 @@
                                 android:id="@+id/stations_list_location_providers"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/list_entry_padding_vertical_verylax" />
+                                android:layout_marginTop="@dimen/text_padding_vertical_verylax" />
                         </LinearLayout>
 
                         <!-- Querying nearby stations -->
@@ -253,8 +253,8 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
-                            android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
-                            android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax"
+                            android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
+                            android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
                             android:gravity="center_horizontal"
                             android:orientation="vertical">
 
@@ -266,7 +266,7 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/list_entry_padding_vertical_verylax"
+                                android:layout_marginTop="@dimen/text_padding_vertical_verylax"
                                 android:gravity="center"
                                 android:maxWidth="256dp"
                                 android:text="@string/stations_list_querying_nearby"
@@ -279,8 +279,8 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
-                            android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
-                            android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax"
+                            android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
+                            android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
                             android:gravity="center_horizontal"
                             android:orientation="vertical">
 
@@ -292,7 +292,7 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/list_entry_padding_vertical_verylax"
+                                android:layout_marginTop="@dimen/text_padding_vertical_verylax"
                                 android:gravity="center"
                                 android:maxWidth="256dp"
                                 android:text="@string/stations_list_matching"
@@ -305,8 +305,8 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
-                            android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
-                            android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax"
+                            android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
+                            android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
                             android:gravity="center_horizontal"
                             android:orientation="vertical">
 
@@ -321,7 +321,7 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/list_entry_padding_vertical_lax"
+                                android:layout_marginTop="@dimen/text_padding_vertical_lax"
                                 android:gravity="center"
                                 android:maxWidth="256dp"
                                 android:text="@string/stations_list_empty_nearby_hint" />
@@ -331,7 +331,7 @@
                                 style="@style/My.Widget.Button.Border"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/list_entry_padding_vertical_verylax"
+                                android:layout_marginTop="@dimen/text_padding_vertical_verylax"
                                 android:text="@string/stations_list_network_settings" />
                         </LinearLayout>
 
@@ -341,8 +341,8 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
-                            android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
-                            android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax"
+                            android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
+                            android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
                             android:gravity="center_horizontal"
                             android:orientation="vertical">
 
@@ -357,7 +357,7 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/list_entry_padding_vertical_lax"
+                                android:layout_marginTop="@dimen/text_padding_vertical_lax"
                                 android:gravity="center"
                                 android:maxWidth="256dp"
                                 android:text="@string/stations_list_empty_query_hint" />
@@ -370,10 +370,10 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="bottom"
-                    android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
-                    android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax"
-                    android:layout_marginTop="@dimen/list_entry_padding_vertical"
-                    android:layout_marginBottom="@dimen/list_entry_padding_vertical"
+                    android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
+                    android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
+                    android:layout_marginTop="@dimen/text_padding_vertical"
+                    android:layout_marginBottom="@dimen/text_padding_vertical"
                     android:baselineAligned="false"
                     android:orientation="horizontal">
 
@@ -383,7 +383,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="bottom"
                         android:layout_weight="1"
-                        android:drawablePadding="@dimen/list_entry_padding_horizontal_lax"
+                        android:drawablePadding="@dimen/text_padding_horizontal_lax"
                         android:gravity="bottom|left"
                         android:maxLines="2"
                         android:textSize="@dimen/font_size_disclaimer" />
@@ -419,8 +419,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|left"
-            android:layout_marginBottom="@dimen/list_entry_padding_vertical"
-            android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
+            android:layout_marginBottom="@dimen/text_padding_vertical"
+            android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
             android:textSize="@dimen/font_size_disclaimer"
             android:textColor="@color/fg_significant_on_light" />
 
diff --git a/oeffi/res/layout/stations_filter_popup_content.xml b/oeffi/res/layout/stations_filter_popup_content.xml
index 49b7165..0ffe4c5 100644
--- a/oeffi/res/layout/stations_filter_popup_content.xml
+++ b/oeffi/res/layout/stations_filter_popup_content.xml
@@ -12,7 +12,7 @@
             android:button="@null"
             android:checked="true"
             android:drawableLeft="@drawable/ic_menu_product_highspeed"
-            android:drawablePadding="@dimen/list_entry_padding_horizontal_lax"
+            android:drawablePadding="@dimen/text_padding_horizontal_lax"
             android:padding="@dimen/dialog_padding"
             android:tag="I"
             android:text="@string/product_i"
@@ -24,7 +24,7 @@
             android:button="@null"
             android:checked="true"
             android:drawableLeft="@drawable/ic_menu_product_bus"
-            android:drawablePadding="@dimen/list_entry_padding_horizontal_lax"
+            android:drawablePadding="@dimen/text_padding_horizontal_lax"
             android:padding="@dimen/dialog_padding"
             android:tag="B"
             android:text="@string/product_b"
@@ -39,7 +39,7 @@
             android:button="@null"
             android:checked="true"
             android:drawableLeft="@drawable/ic_menu_product_train"
-            android:drawablePadding="@dimen/list_entry_padding_horizontal_lax"
+            android:drawablePadding="@dimen/text_padding_horizontal_lax"
             android:padding="@dimen/dialog_padding"
             android:tag="R"
             android:text="@string/product_r"
@@ -51,7 +51,7 @@
             android:button="@null"
             android:checked="true"
             android:drawableLeft="@drawable/ic_menu_product_call"
-            android:drawablePadding="@dimen/list_entry_padding_horizontal_lax"
+            android:drawablePadding="@dimen/text_padding_horizontal_lax"
             android:padding="@dimen/dialog_padding"
             android:tag="P"
             android:text="@string/product_p"
@@ -66,7 +66,7 @@
             android:button="@null"
             android:checked="true"
             android:drawableLeft="@drawable/ic_menu_product_suburban"
-            android:drawablePadding="@dimen/list_entry_padding_horizontal_lax"
+            android:drawablePadding="@dimen/text_padding_horizontal_lax"
             android:padding="@dimen/dialog_padding"
             android:tag="S"
             android:text="@string/product_s"
@@ -78,7 +78,7 @@
             android:button="@null"
             android:checked="true"
             android:drawableLeft="@drawable/ic_menu_product_ferry"
-            android:drawablePadding="@dimen/list_entry_padding_horizontal_lax"
+            android:drawablePadding="@dimen/text_padding_horizontal_lax"
             android:padding="@dimen/dialog_padding"
             android:tag="F"
             android:text="@string/product_f"
@@ -93,7 +93,7 @@
             android:button="@null"
             android:checked="true"
             android:drawableLeft="@drawable/ic_menu_product_subway"
-            android:drawablePadding="@dimen/list_entry_padding_horizontal_lax"
+            android:drawablePadding="@dimen/text_padding_horizontal_lax"
             android:padding="@dimen/dialog_padding"
             android:tag="U"
             android:text="@string/product_u"
@@ -105,7 +105,7 @@
             android:button="@null"
             android:checked="true"
             android:drawableLeft="@drawable/ic_menu_product_cablecar"
-            android:drawablePadding="@dimen/list_entry_padding_horizontal_lax"
+            android:drawablePadding="@dimen/text_padding_horizontal_lax"
             android:padding="@dimen/dialog_padding"
             android:tag="C"
             android:text="@string/product_c"
@@ -120,7 +120,7 @@
             android:button="@null"
             android:checked="true"
             android:drawableLeft="@drawable/ic_menu_product_tram"
-            android:drawablePadding="@dimen/list_entry_padding_horizontal_lax"
+            android:drawablePadding="@dimen/text_padding_horizontal_lax"
             android:padding="@dimen/dialog_padding"
             android:tag="T"
             android:text="@string/product_t"
diff --git a/oeffi/res/layout/stations_station_details_content.xml b/oeffi/res/layout/stations_station_details_content.xml
index 377f0a2..9cbeae8 100644
--- a/oeffi/res/layout/stations_station_details_content.xml
+++ b/oeffi/res/layout/stations_station_details_content.xml
@@ -36,8 +36,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
-                    android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax"
+                    android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
+                    android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
                     android:gravity="center"
                     android:textSize="@dimen/font_size_large" />
             </ViewAnimator>
@@ -47,10 +47,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom"
-                android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
-                android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax"
-                android:layout_marginTop="@dimen/list_entry_padding_vertical"
-                android:layout_marginBottom="@dimen/list_entry_padding_vertical"
+                android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
+                android:layout_marginRight="@dimen/text_padding_horizontal_verylax"
+                android:layout_marginTop="@dimen/text_padding_vertical"
+                android:layout_marginBottom="@dimen/text_padding_vertical"
                 android:baselineAligned="false"
                 android:orientation="horizontal">
 
@@ -60,7 +60,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="bottom"
                     android:layout_weight="1"
-                    android:drawablePadding="@dimen/list_entry_padding_horizontal_lax"
+                    android:drawablePadding="@dimen/text_padding_horizontal_lax"
                     android:gravity="bottom|left"
                     android:maxLines="2"
                     android:textSize="@dimen/font_size_disclaimer" />
@@ -93,8 +93,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|left"
-            android:layout_marginBottom="@dimen/list_entry_padding_vertical"
-            android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax"
+            android:layout_marginBottom="@dimen/text_padding_vertical"
+            android:layout_marginLeft="@dimen/text_padding_horizontal_verylax"
             android:textSize="@dimen/font_size_disclaimer"
             android:textColor="@color/fg_significant_on_light" />
     </FrameLayout>
diff --git a/oeffi/res/layout/stations_station_details_entry.xml b/oeffi/res/layout/stations_station_details_entry.xml
index 550b06a..4dcb2f5 100644
--- a/oeffi/res/layout/stations_station_details_entry.xml
+++ b/oeffi/res/layout/stations_station_details_entry.xml
@@ -7,10 +7,10 @@
     android:clipToPadding="false"
     android:focusable="true"
     android:foreground="?android:attr/selectableItemBackground"
-    android:paddingBottom="@dimen/list_entry_padding_vertical_verylax"
-    android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax"
-    android:paddingRight="@dimen/list_entry_padding_horizontal_verylax"
-    android:paddingTop="@dimen/list_entry_padding_vertical_verylax">
+    android:paddingBottom="@dimen/text_padding_vertical_verylax"
+    android:paddingLeft="@dimen/text_padding_horizontal_verylax"
+    android:paddingRight="@dimen/text_padding_horizontal_verylax"
+    android:paddingTop="@dimen/text_padding_vertical_verylax">
 
     <!-- first row -->
 
@@ -43,8 +43,8 @@
         android:layout_toLeftOf="@id/stations_station_entry_delay"
         android:layout_toRightOf="@id/stations_station_entry_line"
         android:ellipsize="middle"
-        android:paddingLeft="@dimen/list_entry_padding_horizontal"
-        android:paddingRight="@dimen/list_entry_padding_horizontal"
+        android:paddingLeft="@dimen/text_padding_horizontal"
+        android:paddingRight="@dimen/text_padding_horizontal"
         android:singleLine="true" />
 
     <!-- second row -->
@@ -62,7 +62,7 @@
         android:layout_height="wrap_content"
         android:layout_alignBaseline="@id/stations_station_entry_time_abs"
         android:layout_toRightOf="@id/stations_station_entry_line"
-        android:paddingLeft="@dimen/list_entry_padding_horizontal" />
+        android:paddingLeft="@dimen/text_padding_horizontal" />
 
     <TextView
         android:id="@+id/stations_station_entry_capacity_2nd_class"
diff --git a/oeffi/res/layout/stations_station_details_header.xml b/oeffi/res/layout/stations_station_details_header.xml
index 989e411..28424e5 100644
--- a/oeffi/res/layout/stations_station_details_header.xml
+++ b/oeffi/res/layout/stations_station_details_header.xml
@@ -5,22 +5,22 @@
     android:layout_height="wrap_content"
     android:background="@color/bg_divider"
     android:orientation="vertical"
-    android:paddingBottom="@dimen/list_entry_padding_vertical_lax"
-    android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax"
-    android:paddingRight="@dimen/list_entry_padding_horizontal_verylax"
-    android:paddingTop="@dimen/list_entry_padding_vertical_lax">
+    android:paddingBottom="@dimen/text_padding_vertical_lax"
+    android:paddingLeft="@dimen/text_padding_horizontal_verylax"
+    android:paddingRight="@dimen/text_padding_horizontal_verylax"
+    android:paddingTop="@dimen/text_padding_vertical_lax">
 
     <LinearLayout
         android:id="@+id/stations_station_details_header_lines"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/list_entry_padding_vertical_lax"
+        android:layout_marginTop="@dimen/text_padding_vertical_lax"
         android:orientation="vertical" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/list_entry_padding_vertical_lax"
+        android:layout_marginTop="@dimen/text_padding_vertical_lax"
         android:baselineAligned="true"
         android:orientation="horizontal">
 
@@ -35,7 +35,7 @@
             android:id="@+id/stations_station_details_header_id"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/list_entry_padding_horizontal"
+            android:paddingLeft="@dimen/text_padding_horizontal"
             android:textColor="@color/fg_less_significant" />
     </LinearLayout>
 
diff --git a/oeffi/res/layout/stations_station_details_header_line.xml b/oeffi/res/layout/stations_station_details_header_line.xml
index 6059ad4..75c94b0 100644
--- a/oeffi/res/layout/stations_station_details_header_line.xml
+++ b/oeffi/res/layout/stations_station_details_header_line.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:baselineAligned="true"
     android:orientation="horizontal"
-    android:paddingTop="@dimen/list_entry_padding_vertical_cram">
+    android:paddingTop="@dimen/text_padding_vertical_cram">
 
     <de.schildbach.oeffi.stations.LineView
         android:id="@+id/stations_station_details_header_line_line"
@@ -17,7 +17,7 @@
         android:id="@+id/stations_station_details_header_line_destination"
         android:layout_width="0px"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/list_entry_padding_horizontal_lax"
+        android:layout_marginLeft="@dimen/text_padding_horizontal_lax"
         android:layout_weight="1"
         android:ellipsize="middle"
         android:singleLine="true"
diff --git a/oeffi/res/layout/stations_station_entry.xml b/oeffi/res/layout/stations_station_entry.xml
index 0c8351e..0a36ba5 100644
--- a/oeffi/res/layout/stations_station_entry.xml
+++ b/oeffi/res/layout/stations_station_entry.xml
@@ -12,10 +12,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingBottom="@dimen/list_entry_padding_vertical_verylax"
-        android:paddingLeft="@dimen/list_entry_padding_horizontal_verylax"
-        android:paddingRight="@dimen/list_entry_padding_horizontal_verylax"
-        android:paddingTop="@dimen/list_entry_padding_vertical_verylax">
+        android:paddingBottom="@dimen/text_padding_vertical_verylax"
+        android:paddingLeft="@dimen/text_padding_horizontal_verylax"
+        android:paddingRight="@dimen/text_padding_horizontal_verylax"
+        android:paddingTop="@dimen/text_padding_vertical_verylax">
 
         <!-- first row -->
 
@@ -47,15 +47,15 @@
                 android:id="@+id/station_entry_lines"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/list_entry_padding_horizontal"
+                android:paddingLeft="@dimen/text_padding_horizontal"
                 android:textSize="@dimen/font_size_tiny" />
 
             <TextView
                 android:id="@+id/station_entry_distance"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/list_entry_padding_horizontal"
-                android:paddingRight="@dimen/list_entry_padding_horizontal_cram"
+                android:paddingLeft="@dimen/text_padding_horizontal"
+                android:paddingRight="@dimen/text_padding_horizontal_cram"
                 android:textSize="@dimen/font_size_small" />
 
             <de.schildbach.oeffi.stations.CompassNeedleView
@@ -86,7 +86,7 @@
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/list_entry_padding_vertical_cram">
+            android:layout_marginTop="@dimen/text_padding_vertical_cram">
 
             <LinearLayout
                 android:id="@+id/station_entry_departures"
@@ -98,16 +98,16 @@
                 android:id="@+id/station_entry_status"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingBottom="@dimen/list_entry_padding_vertical_cram"
-                android:paddingTop="@dimen/list_entry_padding_vertical_cram"
+                android:paddingBottom="@dimen/text_padding_vertical_cram"
+                android:paddingTop="@dimen/text_padding_vertical_cram"
                 android:textColor="@color/fg_insignificant"
                 android:textStyle="bold" />
 
             <de.schildbach.oeffi.stations.LineView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingBottom="@dimen/list_entry_padding_vertical_cram"
-                android:paddingTop="@dimen/list_entry_padding_vertical_cram"
+                android:paddingBottom="@dimen/text_padding_vertical_cram"
+                android:paddingTop="@dimen/text_padding_vertical_cram"
                 android:visibility="invisible" />
         </FrameLayout>
 
@@ -117,7 +117,7 @@
             android:id="@+id/station_entry_messages"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/list_entry_padding_vertical_cram"
+            android:layout_marginTop="@dimen/text_padding_vertical_cram"
             android:orientation="vertical" />
     </LinearLayout>
 
diff --git a/oeffi/res/layout/stations_station_entry_departure.xml b/oeffi/res/layout/stations_station_entry_departure.xml
index e72585c..7aea00f 100644
--- a/oeffi/res/layout/stations_station_entry_departure.xml
+++ b/oeffi/res/layout/stations_station_entry_departure.xml
@@ -16,8 +16,8 @@
         android:id="@+id/departure_entry_destination"
         android:layout_width="0px"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/list_entry_padding_horizontal"
-        android:layout_marginRight="@dimen/list_entry_padding_horizontal_lax"
+        android:layout_marginLeft="@dimen/text_padding_horizontal"
+        android:layout_marginRight="@dimen/text_padding_horizontal_lax"
         android:layout_weight="1"
         android:ellipsize="middle"
         android:singleLine="true" />
@@ -26,7 +26,7 @@
         android:id="@+id/departure_entry_message_index"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginRight="@dimen/list_entry_padding_horizontal_cram"
+        android:layout_marginRight="@dimen/text_padding_horizontal_cram"
         android:paddingLeft="3dp"
         android:paddingRight="3dp"
         android:singleLine="true"
diff --git a/oeffi/res/layout/stations_station_entry_message.xml b/oeffi/res/layout/stations_station_entry_message.xml
index d479ac2..6769ad7 100644
--- a/oeffi/res/layout/stations_station_entry_message.xml
+++ b/oeffi/res/layout/stations_station_entry_message.xml
@@ -4,6 +4,6 @@
     android:id="@+id/stations_station_entry_message"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingBottom="@dimen/list_entry_padding_vertical_cram"
-    android:paddingTop="@dimen/list_entry_padding_vertical_cram"
+    android:paddingBottom="@dimen/text_padding_vertical_cram"
+    android:paddingTop="@dimen/text_padding_vertical_cram"
     android:textSize="@dimen/font_size_tiny" />
diff --git a/oeffi/res/values-large/dimens.xml b/oeffi/res/values-large/dimens.xml
index 5cc824a..bc6eee7 100644
--- a/oeffi/res/values-large/dimens.xml
+++ b/oeffi/res/values-large/dimens.xml
@@ -10,14 +10,14 @@
     <dimen name="action_bar_height">55dp</dimen>
     <dimen name="action_bar_button_width">55dp</dimen>
     <dimen name="action_bar_padding">6dp</dimen>
-    <dimen name="list_entry_padding_vertical_cram">2dp</dimen>
-    <dimen name="list_entry_padding_vertical">5dp</dimen>
-    <dimen name="list_entry_padding_vertical_lax">6dp</dimen>
-    <dimen name="list_entry_padding_vertical_verylax">8dp</dimen>
-    <dimen name="list_entry_padding_horizontal_cram">3dp</dimen>
-    <dimen name="list_entry_padding_horizontal">6dp</dimen>
-    <dimen name="list_entry_padding_horizontal_lax">11dp</dimen>
-    <dimen name="list_entry_padding_horizontal_verylax">16dp</dimen>
+    <dimen name="text_padding_vertical_cram">2dp</dimen>
+    <dimen name="text_padding_vertical">5dp</dimen>
+    <dimen name="text_padding_vertical_lax">6dp</dimen>
+    <dimen name="text_padding_vertical_verylax">8dp</dimen>
+    <dimen name="text_padding_horizontal_cram">3dp</dimen>
+    <dimen name="text_padding_horizontal">6dp</dimen>
+    <dimen name="text_padding_horizontal_lax">11dp</dimen>
+    <dimen name="text_padding_horizontal_verylax">16dp</dimen>
     <dimen name="station_widget_divider_width">2dp</dimen>
     <dimen name="directions_form_location_min_height">52dp</dimen>
     <dimen name="directions_form_location_divider_padding">36dp</dimen>
diff --git a/oeffi/res/values-xlarge/dimens.xml b/oeffi/res/values-xlarge/dimens.xml
index 82c8643..73c9016 100644
--- a/oeffi/res/values-xlarge/dimens.xml
+++ b/oeffi/res/values-xlarge/dimens.xml
@@ -11,14 +11,14 @@
     <dimen name="action_bar_button_width">50dp</dimen>
     <dimen name="action_bar_padding">8dp</dimen>
     <dimen name="dialog_padding">16dp</dimen>
-    <dimen name="list_entry_padding_vertical_cram">3dp</dimen>
-    <dimen name="list_entry_padding_vertical">6dp</dimen>
-    <dimen name="list_entry_padding_vertical_lax">8dp</dimen>
-    <dimen name="list_entry_padding_vertical_verylax">12dp</dimen>
-    <dimen name="list_entry_padding_horizontal_cram">4dp</dimen>
-    <dimen name="list_entry_padding_horizontal">9dp</dimen>
-    <dimen name="list_entry_padding_horizontal_lax">14dp</dimen>
-    <dimen name="list_entry_padding_horizontal_verylax">20dp</dimen>
+    <dimen name="text_padding_vertical_cram">3dp</dimen>
+    <dimen name="text_padding_vertical">6dp</dimen>
+    <dimen name="text_padding_vertical_lax">8dp</dimen>
+    <dimen name="text_padding_vertical_verylax">12dp</dimen>
+    <dimen name="text_padding_horizontal_cram">4dp</dimen>
+    <dimen name="text_padding_horizontal">9dp</dimen>
+    <dimen name="text_padding_horizontal_lax">14dp</dimen>
+    <dimen name="text_padding_horizontal_verylax">20dp</dimen>
     <dimen name="station_widget_divider_width">4dp</dimen>
     <dimen name="directions_form_location_min_height">60dp</dimen>
     <dimen name="directions_form_location_divider_padding">42dp</dimen>
diff --git a/oeffi/res/values/dimens.xml b/oeffi/res/values/dimens.xml
index 548967f..7fb5452 100644
--- a/oeffi/res/values/dimens.xml
+++ b/oeffi/res/values/dimens.xml
@@ -15,14 +15,14 @@
     <dimen name="line_max_width">128dp</dimen>
     <dimen name="line_style_border_stroke">2dp</dimen>
     <dimen name="position_max_width">96dp</dimen>
-    <dimen name="list_entry_padding_vertical_cram">2dp</dimen>
-    <dimen name="list_entry_padding_vertical">3dp</dimen>
-    <dimen name="list_entry_padding_vertical_lax">4dp</dimen>
-    <dimen name="list_entry_padding_vertical_verylax">6dp</dimen>
-    <dimen name="list_entry_padding_horizontal_cram">2dp</dimen>
-    <dimen name="list_entry_padding_horizontal">4dp</dimen>
-    <dimen name="list_entry_padding_horizontal_lax">8dp</dimen>
-    <dimen name="list_entry_padding_horizontal_verylax">12dp</dimen>
+    <dimen name="text_padding_vertical_cram">2dp</dimen>
+    <dimen name="text_padding_vertical">3dp</dimen>
+    <dimen name="text_padding_vertical_lax">4dp</dimen>
+    <dimen name="text_padding_vertical_verylax">6dp</dimen>
+    <dimen name="text_padding_horizontal_cram">2dp</dimen>
+    <dimen name="text_padding_horizontal">4dp</dimen>
+    <dimen name="text_padding_horizontal_lax">8dp</dimen>
+    <dimen name="text_padding_horizontal_verylax">12dp</dimen>
     <dimen name="station_widget_divider_width">0px</dimen>
     <dimen name="directions_form_location_min_height">48dp</dimen>
     <dimen name="directions_form_location_divider_padding">32dp</dimen>
diff --git a/oeffi/src/de/schildbach/oeffi/directions/LocationView.java b/oeffi/src/de/schildbach/oeffi/directions/LocationView.java
index 01cb9a6..da74771 100644
--- a/oeffi/src/de/schildbach/oeffi/directions/LocationView.java
+++ b/oeffi/src/de/schildbach/oeffi/directions/LocationView.java
@@ -152,9 +152,9 @@ public class LocationView extends FrameLayout implements LocationHelper.Callback
         textView.setSelectAllOnFocus(true);
         textView.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
         textView.setThreshold(0);
-        textView.setCompoundDrawablePadding(res.getDimensionPixelSize(R.dimen.list_entry_padding_horizontal_lax));
-        final int paddingCram = res.getDimensionPixelSize(R.dimen.list_entry_padding_horizontal_cram);
-        final int paddingLax = res.getDimensionPixelSize(R.dimen.list_entry_padding_horizontal_verylax);
+        textView.setCompoundDrawablePadding(res.getDimensionPixelSize(R.dimen.text_padding_horizontal_lax));
+        final int paddingCram = res.getDimensionPixelSize(R.dimen.text_padding_horizontal_cram);
+        final int paddingLax = res.getDimensionPixelSize(R.dimen.text_padding_horizontal_verylax);
         textView.setPadding(paddingLax, paddingCram, paddingLax, paddingCram);
         textView.setOnItemClickListener((parent, view, position, id) -> {
             // workaround for NPE
diff --git a/oeffi/src/de/schildbach/oeffi/directions/TripsGallery.java b/oeffi/src/de/schildbach/oeffi/directions/TripsGallery.java
index f5c4d78..147d88c 100644
--- a/oeffi/src/de/schildbach/oeffi/directions/TripsGallery.java
+++ b/oeffi/src/de/schildbach/oeffi/directions/TripsGallery.java
@@ -75,7 +75,7 @@ public class TripsGallery extends Gallery {
         this.context = context;
 
         final Resources res = getResources();
-        paddingHorizontal = res.getDimensionPixelSize(R.dimen.list_entry_padding_horizontal);
+        paddingHorizontal = res.getDimensionPixelSize(R.dimen.text_padding_horizontal);
         density = res.getDisplayMetrics().density;
         final float strokeWidth = res.getDimension(R.dimen.trips_overview_stroke_width);
         final int colorSignificant = res.getColor(R.color.fg_significant);
diff --git a/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java
index 216e4c9..c1d3c76 100644
--- a/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java
@@ -571,7 +571,7 @@ public class StationDetailsActivity extends OeffiActivity implements StationsAwa
 
             inflater = LayoutInflater.from(context);
             final Resources res = context.getResources();
-            LINES_LAYOUT_PARAMS.setMargins(0, res.getDimensionPixelSize(R.dimen.list_entry_padding_vertical_cram), 0,
+            LINES_LAYOUT_PARAMS.setMargins(0, res.getDimensionPixelSize(R.dimen.text_padding_vertical_cram), 0,
                     0);
         }
 
diff --git a/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java
index dac41de..45f4908 100644
--- a/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java
@@ -294,7 +294,7 @@ public class StationsActivity extends OeffiMainActivity implements StationsAware
                     private final Drawable drawableClear = getResources().getDrawable(R.drawable.ic_clear_black_24dp);
                     private final Drawable drawableBlock = getResources().getDrawable(R.drawable.ic_block_black_24dp);
                     private final int starMargin = getResources()
-                            .getDimensionPixelOffset(R.dimen.list_entry_padding_horizontal_lax);
+                            .getDimensionPixelOffset(R.dimen.text_padding_horizontal_lax);
                     private final int actionTriggerThreshold = Ints.max(drawableStar.getIntrinsicWidth(),
                             drawableClear.getIntrinsicWidth(), drawableBlock.getIntrinsicWidth()) + starMargin * 2;
 
diff --git a/oeffi/src/de/schildbach/oeffi/stations/list/StationViewHolder.java b/oeffi/src/de/schildbach/oeffi/stations/list/StationViewHolder.java
index 402b6a3..015e467 100644
--- a/oeffi/src/de/schildbach/oeffi/stations/list/StationViewHolder.java
+++ b/oeffi/src/de/schildbach/oeffi/stations/list/StationViewHolder.java
@@ -113,7 +113,7 @@ public class StationViewHolder extends RecyclerView.ViewHolder {
         this.colorLessSignificant = res.getColor(R.color.fg_less_significant);
         this.colorInsignificant = res.getColor(R.color.fg_insignificant);
         this.colorHighlighted = res.getColor(R.color.fg_highlighted);
-        this.listEntryVerticalPadding = res.getDimensionPixelOffset(R.dimen.list_entry_padding_vertical);
+        this.listEntryVerticalPadding = res.getDimensionPixelOffset(R.dimen.text_padding_vertical);
     }
 
     public void bind(final Station station, final Set<Product> productsFilter, final boolean forceShowPlace,