diff --git a/mobile/com.sap.sailing.android.tracking.app/lint.xml b/mobile/com.sap.sailing.android.tracking.app/lint.xml
index 2a9401f5628..a54ac01c09c 100644
--- a/mobile/com.sap.sailing.android.tracking.app/lint.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/lint.xml
@@ -12,5 +12,11 @@
 		<!-- Reason: Eclipse users don't get the override -->
     <issue id="GradleOverrides">
     		<ignore path="AndroidManifest.xml" />
+    </issue>
+
+		<!-- Reason: Yes, overlap possible, but can easily be caught by testers / also: not critical -->
+    <issue id="RelativeOverlap">
+    		<ignore path="res/layout/fragment_tracking.xml" />
+    		<ignore path="res/layout-land/fragment_tracking.xml" />
     </issue>
 </lint>
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/background_lighter_box.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/background_lighter_box.xml
deleted file mode 100644
index 4f119da6a3c..00000000000
--- a/mobile/com.sap.sailing.android.tracking.app/res/drawable/background_lighter_box.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle" >
-
-    <solid android:color="#ccffffff" />
-
-    <stroke
-        android:width="1dip"
-        android:color="#ffffff" />
-
-    <corners android:radius="0dip" />
-
-</shape>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/button_transparent.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/button_transparent.xml
deleted file mode 100644
index 938d6c1eb72..00000000000
--- a/mobile/com.sap.sailing.android.tracking.app/res/drawable/button_transparent.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle" >
-
-    <corners android:radius="5dp" />
-
-    <solid android:color="#55FFFFFF" />
-
-    <stroke
-        android:width="2dp"
-        android:color="#FFFFFF" />
-
-</shape>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_regatta.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_regatta.xml
index 1ac4df618a6..34fa94bb002 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_regatta.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_regatta.xml
@@ -101,6 +101,7 @@
                         android:layout_width="20dp"
                         android:layout_height="fill_parent"
                         android:scaleType="fitXY"
+                        android:contentDescription="@string/content_description_flag_icon"
                         android:textColor="@color/white" />
                 </RelativeLayout>
 
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
index c89bd3573b9..c7258732c53 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_regatta.xml
@@ -83,6 +83,7 @@
                     android:layout_width="20dp"
                     android:layout_height="fill_parent"
                     android:scaleType="fitXY"
+                    android:contentDescription="@string/content_description_flag_icon"
                     android:textColor="@color/white" />
             </RelativeLayout>
             
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
index 0598fa977f9..aa256dbbecf 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
@@ -5,9 +5,7 @@
     <color name="white_less_transparent">#CCFFFFFF</color>
     <color name="black_transparent">#55000000</color>
     <color name="black">#000000</color>
-    <color name="red">#FF0000</color>
     <color name="green">#00FF00</color>
-    <color name="blue">#0000FF</color>
     <color name="gray">#333333</color>
     <color name="darker_gray">#242424</color>
     <color name="sap_green">#8AB54E</color>
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml
index 55c1e5908c7..f426e73c6c8 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/dimens.xml
@@ -2,6 +2,6 @@
 
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
+    <!-- <dimen name="activity_vertical_margin">16dp</dimen> -->
 
 </resources>
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/dimens_fragment.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/dimens_fragment.xml
index e017099cc5c..89954c708d5 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/dimens_fragment.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/dimens_fragment.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <dimen name="fragment_padding">10dp</dimen>
+    <!-- <dimen name="fragment_padding">10dp</dimen>
     <dimen name="list_view_height">100dp</dimen>
     <dimen name="team_picture_height">150dp</dimen>
-    <dimen name="team_picture_negative_margin">-25dp</dimen>
+    <dimen name="team_picture_negative_margin">-25dp</dimen> -->
 
 </resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml
index ee288e93c05..83642f70d25 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml
@@ -85,4 +85,5 @@
 	<string name="initial_zero" translatable="false">0</string>
 	<string name="initial_hyphen" translatable="false">-</string>
 	<string name="initial_hyphen_degrees" translatable="false">-°</string>
+	<string name="content_description_flag_icon" translatable="false">flag icon</string>
 </resources>
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/xml/preference_headers.xml b/mobile/com.sap.sailing.android.tracking.app/res/xml/preference_headers.xml
deleted file mode 100644
index 0ae912006d1..00000000000
--- a/mobile/com.sap.sailing.android.tracking.app/res/xml/preference_headers.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
-    <header
-        android:fragment="com.sap.sailing.android.tracking.app.ui.fragments.preference.GeneralPreferenceFragment"
-        android:title="@string/settings_category_general" />    
-</preference-headers>