new button "lock" state -> colored corner

mobile/com.sap.sailing.racecommittee.app/res/drawable-sw600dp/corner_dark.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bitmap
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ic_lock_outline_white_alpha_50dp"/>
+    android:src="@drawable/corner_dark_20dp"/>

mobile/com.sap.sailing.racecommittee.app/res/drawable-sw600dp/corner_light.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bitmap
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ic_lock_outline_black_alpha_25dp"/>
+    android:src="@drawable/corner_light_20dp"/>

mobile/com.sap.sailing.racecommittee.app/res/drawable-sw600dp/ic_lock_outline_black_more_alpha.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ic_lock_outline_black_more_alpha_35dp"/>

mobile/com.sap.sailing.racecommittee.app/res/drawable-sw600dp/ic_lock_outline_white_more_alpha.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ic_lock_outline_white_more_alpha_35dp"/>

mobile/com.sap.sailing.racecommittee.app/res/drawable-sw720dp/ic_lock_outline_black_more_alpha.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ic_lock_outline_black_more_alpha_50dp"/>

mobile/com.sap.sailing.racecommittee.app/res/drawable-sw720dp/ic_lock_outline_white_more_alpha.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ic_lock_outline_white_more_alpha_50dp"/>

mobile/com.sap.sailing.racecommittee.app/res/drawable/corner_dark.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bitmap
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ic_lock_outline_black_alpha_50dp"/>
+    android:src="@drawable/corner_dark_12dp"/>

mobile/com.sap.sailing.racecommittee.app/res/drawable/corner_light.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bitmap
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ic_lock_outline_white_alpha_25dp"/>
+    android:src="@drawable/corner_light_12dp"/>

mobile/com.sap.sailing.racecommittee.app/res/drawable/ic_lock_outline_black_more_alpha.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ic_lock_outline_black_more_alpha_25dp"/>

mobile/com.sap.sailing.racecommittee.app/res/drawable/ic_lock_outline_white_more_alpha.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ic_lock_outline_white_more_alpha_25dp"/>

mobile/com.sap.sailing.racecommittee.app/res/layout/panel_button_abandon.xml

@@ -4,38 +4,27 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent">
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:orientation="vertical">
-
-        <RelativeLayout
-            android:layout_width="@dimen/side_button_imageSize"
-            android:layout_height="@dimen/side_button_imageSize"
-            android:layout_gravity="center_horizontal">
-
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:src="?attr/flags_abandon"/>
-
-            <ImageView
-                android:id="@+id/abandon_flags_lock"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:src="?attr/lock_outline_black"
-                android:visibility="gone"
-                tools:visibility="visible"/>
-        </RelativeLayout>
+        android:layout_centerInParent="true">
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:orientation="horizontal"
-            tools:ignore="UseCompoundDrawables">
+            android:layout_centerInParent="true"
+            android:orientation="vertical">
+
+            <RelativeLayout
+                android:layout_width="@dimen/side_button_imageSize"
+                android:layout_height="@dimen/side_button_imageSize"
+                android:layout_gravity="center_horizontal">
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:src="?attr/flags_abandon"/>
+            </RelativeLayout>
 
             <TextView
                 android:layout_width="wrap_content"
@@ -44,5 +33,15 @@
                 android:text="@string/flags_abandon"
                 android:textAppearance="?attr/textPanelCaption"/>
         </LinearLayout>
-    </LinearLayout>
+
+        <ImageView
+            android:id="@+id/abandon_flags_lock"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            android:src="?attr/corner"
+            android:visibility="gone"
+            tools:visibility="visible"/>
+    </RelativeLayout>
 </merge>

mobile/com.sap.sailing.racecommittee.app/res/layout/panel_button_course.xml

@@ -4,38 +4,27 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent">
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:orientation="vertical">
-
-        <RelativeLayout
-            android:layout_width="@dimen/side_button_imageSize"
-            android:layout_height="@dimen/side_button_imageSize"
-            android:layout_gravity="center_horizontal">
-
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:src="?attr/flags_course"/>
-
-            <ImageView
-                android:id="@+id/course_flags_lock"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="?attr/lock_outline_black"
-                android:layout_centerInParent="true"
-                android:visibility="gone"
-                tools:visibility="visible"/>
-        </RelativeLayout>
+        android:layout_centerInParent="true">
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:orientation="horizontal"
-            tools:ignore="UseCompoundDrawables">
+            android:layout_centerInParent="true"
+            android:orientation="vertical">
+
+            <RelativeLayout
+                android:layout_width="@dimen/side_button_imageSize"
+                android:layout_height="@dimen/side_button_imageSize"
+                android:layout_gravity="center_horizontal">
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:src="?attr/flags_course"/>
+            </RelativeLayout>
 
             <TextView
                 android:layout_width="wrap_content"
@@ -44,5 +33,15 @@
                 android:text="@string/flags_course"
                 android:textAppearance="?attr/textPanelCaption"/>
         </LinearLayout>
-    </LinearLayout>
+
+        <ImageView
+            android:id="@+id/course_flags_lock"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            android:src="?attr/corner"
+            android:visibility="gone"
+            tools:visibility="visible"/>
+    </RelativeLayout>
 </merge>

mobile/com.sap.sailing.racecommittee.app/res/layout/panel_button_more.xml

@@ -4,38 +4,27 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent">
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:orientation="vertical">
-
-        <RelativeLayout
-            android:layout_width="@dimen/side_button_imageSize"
-            android:layout_height="@dimen/side_button_imageSize"
-            android:layout_gravity="center_horizontal">
-
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/side_button_imageSize"
-                android:src="?attr/flags_more"/>
-
-            <ImageView
-                android:id="@+id/more_flags_lock"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:src="?attr/lock_outline_black"
-                android:visibility="gone"
-                tools:visibility="visible"/>
-        </RelativeLayout>
+        android:layout_centerInParent="true">
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:orientation="horizontal"
-            tools:ignore="UseCompoundDrawables">
+            android:layout_centerInParent="true"
+            android:orientation="vertical">
+
+            <RelativeLayout
+                android:layout_width="@dimen/side_button_imageSize"
+                android:layout_height="@dimen/side_button_imageSize"
+                android:layout_gravity="center_horizontal">
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/side_button_imageSize"
+                    android:src="?attr/flags_more"/>
+            </RelativeLayout>
 
             <TextView
                 android:layout_width="wrap_content"
@@ -44,5 +33,15 @@
                 android:text="@string/flags_more"
                 android:textAppearance="?attr/textPanelCaption"/>
         </LinearLayout>
-    </LinearLayout>
+
+        <ImageView
+            android:id="@+id/more_flags_lock"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            android:src="?attr/corner"
+            android:visibility="gone"
+            tools:visibility="visible"/>
+    </RelativeLayout>
 </merge>

mobile/com.sap.sailing.racecommittee.app/res/layout/panel_button_postpone.xml

@@ -4,45 +4,44 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent">
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:orientation="vertical">
-
-        <RelativeLayout
-            android:layout_width="@dimen/side_button_imageSize"
-            android:layout_height="@dimen/side_button_imageSize"
-            android:layout_gravity="center_horizontal">
-
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center_horizontal"
-                android:src="?attr/flags_postpone"/>
-
-            <ImageView
-                android:id="@+id/postpone_flags_lock"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:src="?attr/lock_outline_black"
-                android:visibility="gone"
-                tools:visibility="visible"/>
-        </RelativeLayout>
+        android:layout_centerInParent="true">
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:orientation="horizontal"
-            tools:ignore="UseCompoundDrawables">
+            android:layout_centerInParent="true"
+            android:orientation="vertical">
+
+            <RelativeLayout
+                android:layout_width="@dimen/side_button_imageSize"
+                android:layout_height="@dimen/side_button_imageSize"
+                android:layout_gravity="center_horizontal">
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:src="?attr/flags_postpone"/>
+            </RelativeLayout>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
                 android:text="@string/flags_postpone"
                 android:textAppearance="?attr/textPanelCaption"/>
         </LinearLayout>
-    </LinearLayout>
+
+        <ImageView
+            android:id="@+id/postpone_flags_lock"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            android:src="?attr/corner"
+            android:visibility="gone"
+            tools:visibility="visible"/>
+    </RelativeLayout>
 </merge>

mobile/com.sap.sailing.racecommittee.app/res/layout/panel_button_recall.xml

@@ -4,38 +4,27 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent">
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:orientation="vertical">
-
-        <RelativeLayout
-            android:layout_width="@dimen/side_button_imageSize"
-            android:layout_height="@dimen/side_button_imageSize"
-            android:layout_gravity="center_horizontal">
-
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:src="?attr/flags_recall"/>
-
-            <ImageView
-                android:id="@+id/recall_flags_lock"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:src="?attr/lock_outline_black"
-                android:visibility="gone"
-                tools:visibility="visible"/>
-        </RelativeLayout>
+        android:layout_centerInParent="true">
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:orientation="horizontal"
-            tools:ignore="UseCompoundDrawables">
+            android:layout_centerInParent="true"
+            android:orientation="vertical">
+
+            <RelativeLayout
+                android:layout_width="@dimen/side_button_imageSize"
+                android:layout_height="@dimen/side_button_imageSize"
+                android:layout_gravity="center_horizontal">
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:src="?attr/flags_recall"/>
+            </RelativeLayout>
 
             <TextView
                 android:layout_width="wrap_content"
@@ -44,5 +33,15 @@
                 android:text="@string/flags_recall"
                 android:textAppearance="?attr/textPanelCaption"/>
         </LinearLayout>
-    </LinearLayout>
+
+        <ImageView
+            android:id="@+id/recall_flags_lock"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            android:src="?attr/corner"
+            android:visibility="gone"
+            tools:visibility="visible"/>
+    </RelativeLayout>
 </merge>

mobile/com.sap.sailing.racecommittee.app/res/layout/race_panel_more.xml

@@ -26,19 +26,14 @@
                 android:layout_alignParentBottom="true"
                 android:src="?attr/marker"/>
 
-            <LinearLayout
+            <TextView
                 android:id="@+id/start_mode_header"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
-                android:layout_marginTop="@dimen/side_padding">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/start_mode"
-                    android:textAppearance="?attr/textPanelHeader"/>
-            </LinearLayout>
+                android:layout_marginTop="@dimen/side_padding"
+                android:text="@string/start_mode"
+                android:textAppearance="?attr/textPanelHeader"/>
 
             <RelativeLayout
                 android:layout_width="match_parent"
@@ -57,10 +52,11 @@
                     android:id="@+id/start_mode_lock"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:src="?attr/lock_outline_black"
+                    android:src="?attr/corner"
                     android:visibility="gone"
-                    tools:visibility="visible"/>
+                    tools:visibility="visible"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentBottom="true"/>
             </RelativeLayout>
 
             <ImageView
@@ -86,19 +82,14 @@
                 android:layout_alignParentBottom="true"
                 android:src="?attr/marker"/>
 
-            <LinearLayout
+            <TextView
                 android:id="@+id/gate_pathfinder_header"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
-                android:layout_marginTop="@dimen/side_padding">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/gate_start_pathfinder"
-                    android:textAppearance="?attr/textPanelHeader"/>
-            </LinearLayout>
+                android:layout_marginTop="@dimen/side_padding"
+                android:text="@string/gate_start_pathfinder"
+                android:textAppearance="?attr/textPanelHeader"/>
 
             <RelativeLayout
                 android:layout_width="match_parent"
@@ -117,10 +108,11 @@
                     android:id="@+id/gate_pathfinder_lock"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:src="?attr/lock_outline_alpha"
+                    android:src="?attr/corner"
                     android:visibility="gone"
-                    tools:visibility="visible"/>
+                    tools:visibility="visible"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentBottom="true"/>
             </RelativeLayout>
 
             <ImageView
@@ -146,19 +138,14 @@
                 android:layout_alignParentBottom="true"
                 android:src="?attr/marker"/>
 
-            <LinearLayout
+            <TextView
                 android:id="@+id/gate_timing_header"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
-                android:layout_marginTop="@dimen/side_padding">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/gate_start_timing"
-                    android:textAppearance="?attr/textPanelHeader"/>
-            </LinearLayout>
+                android:layout_marginTop="@dimen/side_padding"
+                android:text="@string/gate_start_timing"
+                android:textAppearance="?attr/textPanelHeader"/>
 
             <RelativeLayout
                 android:layout_width="match_parent"
@@ -170,18 +157,19 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
-                    android:textAppearance="?attr/textPanelCaption"
                     android:gravity="center"
+                    android:textAppearance="?attr/textPanelCaption"
                     tools:text="4 + 3 = 7 Minuten"/>
 
                 <ImageView
                     android:id="@+id/gate_timing_lock"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:src="?attr/lock_outline_alpha"
+                    android:src="?attr/corner"
                     android:visibility="gone"
-                    tools:visibility="visible"/>
+                    tools:visibility="visible"
+                    android:layout_alignParentBottom="true"
+                    android:layout_alignParentRight="true"/>
             </RelativeLayout>
 
             <ImageView

mobile/com.sap.sailing.racecommittee.app/res/layout/race_panel_setup_hor.xml

@@ -26,20 +26,14 @@
                 android:layout_alignParentBottom="true"
                 android:src="?attr/marker"/>
 
-            <LinearLayout
+            <TextView
                 android:id="@+id/start_procedure_header"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
-                android:layout_marginTop="@dimen/side_padding">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:text="@string/start_procedure"
-                    android:textAppearance="?attr/textPanelHeader"/>
-            </LinearLayout>
+                android:layout_marginTop="@dimen/side_padding"
+                android:text="@string/start_procedure"
+                android:textAppearance="?attr/textPanelHeader"/>
 
             <RelativeLayout
                 android:layout_width="match_parent"
@@ -61,10 +55,11 @@
                     android:id="@+id/start_procedure_lock"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:src="?attr/lock_outline_alpha"
+                    android:src="?attr/corner"
                     android:visibility="gone"
-                    tools:visibility="visible"/>
+                    tools:visibility="visible"
+                    android:layout_alignParentBottom="true"
+                    android:layout_alignParentRight="true"/>
             </RelativeLayout>
 
             <ImageView
@@ -89,20 +84,14 @@
                 android:layout_alignParentBottom="true"
                 android:src="?attr/marker"/>
 
-            <LinearLayout
+            <TextView
                 android:id="@+id/course_header"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
-                android:layout_marginTop="@dimen/side_padding">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:text="@string/course"
-                    android:textAppearance="?attr/textPanelHeader"/>
-            </LinearLayout>
+                android:layout_marginTop="@dimen/side_padding"
+                android:text="@string/course"
+                android:textAppearance="?attr/textPanelHeader"/>
 
             <RelativeLayout
                 android:layout_width="match_parent"
@@ -122,10 +111,11 @@
                     android:id="@+id/course_lock"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:src="?attr/lock_outline_alpha"
+                    android:src="?attr/corner"
                     android:visibility="gone"
-                    tools:visibility="visible"/>
+                    tools:visibility="visible"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentBottom="true"/>
             </RelativeLayout>
 
             <ImageView
@@ -149,20 +139,14 @@
                 android:layout_alignParentBottom="true"
                 android:src="?attr/marker"/>
 
-            <LinearLayout
+            <TextView
                 android:id="@+id/wind_header"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
-                android:layout_marginTop="@dimen/side_padding">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:text="@string/wind"
-                    android:textAppearance="?attr/textPanelHeader"/>
-            </LinearLayout>
+                android:layout_marginTop="@dimen/side_padding"
+                android:text="@string/wind"
+                android:textAppearance="?attr/textPanelHeader"/>
 
             <RelativeLayout
                 android:layout_width="match_parent"
@@ -182,10 +166,11 @@
                     android:id="@+id/wind_lock"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:src="?attr/lock_outline_alpha"
+                    android:src="?attr/corner"
                     android:visibility="gone"
-                    tools:visibility="visible"/>
+                    tools:visibility="visible"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentBottom="true"/>
             </RelativeLayout>
         </RelativeLayout>
     </LinearLayout>

mobile/com.sap.sailing.racecommittee.app/res/layout/race_panel_setup_ver.xml

@@ -25,20 +25,14 @@
                 android:layout_alignParentBottom="true"
                 android:src="?attr/marker"/>
 
-            <LinearLayout
+            <TextView
                 android:id="@+id/start_procedure_header"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
-                android:layout_marginTop="@dimen/side_padding">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:text="@string/start_procedure"
-                    android:textAppearance="?attr/textPanelHeader"/>
-            </LinearLayout>
+                android:layout_marginTop="@dimen/side_padding"
+                android:text="@string/start_procedure"
+                android:textAppearance="?attr/textPanelHeader"/>
 
             <RelativeLayout
                 android:layout_width="match_parent"
@@ -60,10 +54,11 @@
                     android:id="@+id/start_procedure_lock"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:src="?attr/lock_outline_alpha"
+                    android:src="?attr/corner"
                     android:visibility="gone"
-                    tools:visibility="visible"/>
+                    tools:visibility="visible"
+                    android:layout_alignParentBottom="true"
+                    android:layout_alignParentRight="true"/>
             </RelativeLayout>
         </RelativeLayout>
 
@@ -81,20 +76,14 @@
                 android:layout_alignParentBottom="true"
                 android:src="?attr/marker"/>
 
-            <LinearLayout
+            <TextView
                 android:id="@+id/course_header"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
-                android:layout_marginTop="@dimen/side_padding">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:text="@string/course"
-                    android:textAppearance="?attr/textPanelHeader"/>
-            </LinearLayout>
+                android:layout_marginTop="@dimen/side_padding"
+                android:text="@string/course"
+                android:textAppearance="?attr/textPanelHeader"/>
 
             <RelativeLayout
                 android:layout_width="match_parent"
@@ -114,10 +103,11 @@
                     android:id="@+id/course_lock"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:src="?attr/lock_outline_alpha"
+                    android:src="?attr/corner"
                     android:visibility="gone"
-                    tools:visibility="visible"/>
+                    tools:visibility="visible"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentBottom="true"/>
             </RelativeLayout>
         </RelativeLayout>
 
@@ -135,20 +125,14 @@
                 android:layout_alignParentBottom="true"
                 android:src="?attr/marker"/>
 
-            <LinearLayout
+            <TextView
                 android:id="@+id/wind_header"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
-                android:layout_marginTop="@dimen/side_padding">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:text="@string/wind"
-                    android:textAppearance="?attr/textPanelHeader"/>
-            </LinearLayout>
+                android:layout_marginTop="@dimen/side_padding"
+                android:text="@string/wind"
+                android:textAppearance="?attr/textPanelHeader"/>
 
             <RelativeLayout
                 android:layout_width="match_parent"
@@ -168,10 +152,11 @@
                     android:id="@+id/wind_lock"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:src="?attr/lock_outline_alpha"
+                    android:src="?attr/corner"
                     android:visibility="gone"
-                    tools:visibility="visible"/>
+                    tools:visibility="visible"
+                    android:layout_alignParentBottom="true"
+                    android:layout_alignParentRight="true"/>
             </RelativeLayout>
         </RelativeLayout>
 
@@ -189,20 +174,14 @@
                 android:layout_alignParentBottom="true"
                 android:src="?attr/marker"/>
 
-            <LinearLayout
+            <TextView
                 android:id="@+id/start_procedure_more_header"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
-                android:layout_marginTop="@dimen/side_padding">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:text="@string/start_procedure_more"
-                    android:textAppearance="?attr/textPanelHeader"/>
-            </LinearLayout>
+                android:layout_marginTop="@dimen/side_padding"
+                android:text="@string/start_procedure_more"
+                android:textAppearance="?attr/textPanelHeader"/>
 
             <RelativeLayout
                 android:layout_width="match_parent"
@@ -220,10 +199,11 @@
                     android:id="@+id/start_procedure_more_lock"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:src="?attr/lock_outline_alpha"
+                    android:src="?attr/corner"
                     android:visibility="gone"
-                    tools:visibility="visible"/>
+                    tools:visibility="visible"
+                    android:layout_alignParentBottom="true"
+                    android:layout_alignParentRight="true"/>
             </RelativeLayout>
         </RelativeLayout>
     </LinearLayout>

mobile/com.sap.sailing.racecommittee.app/res/values/attrs.xml

@@ -58,6 +58,7 @@
     <attr name="create" format="reference"/>
     <attr name="compass_back" format="reference"/>
     <attr name="compass_needle" format="reference"/>
+    <attr name="corner" format="reference"/>
     <attr name="course_triangle_48dp" format="reference"/>
     <attr name="course_triangle_64dp" format="reference"/>
     <attr name="course_updown_48dp" format="reference"/>
@@ -66,8 +67,6 @@
     <attr name="hearing" format="reference"/>
     <attr name="link_24dp" format="reference"/>
     <attr name="lock_outline" format="reference"/>
-    <attr name="lock_outline_alpha" format="reference"/>
-    <attr name="lock_outline_black" format="reference"/>
     <attr name="keyboard_control_36dp" format="reference"/>
     <attr name="marker" format="reference"/>
     <attr name="marker_race" format="reference"/>

mobile/com.sap.sailing.racecommittee.app/res/values/themes_dark.xml

@@ -69,6 +69,7 @@
         <item name="create">@drawable/ic_create_dark</item>
         <item name="compass_back">@drawable/compass_back_dark</item>
         <item name="compass_needle">@drawable/compass_needle_dark</item>
+        <item name="corner">@drawable/corner_dark</item>
         <item name="course_triangle_48dp">@drawable/course_triangle_48dp_dark</item>
         <item name="course_triangle_64dp">@drawable/course_triangle_64dp_dark</item>
         <item name="course_updown_48dp">@drawable/course_updown_48dp_dark</item>
@@ -77,8 +78,6 @@
         <item name="hearing">@drawable/ic_hearing_white</item>
         <item name="link_24dp">@drawable/ic_link_white_24dp</item>
         <item name="lock_outline">@drawable/ic_lock_outline_white</item>
-        <item name="lock_outline_alpha">@drawable/ic_lock_outline_white_more_alpha</item>
-        <item name="lock_outline_black">@drawable/ic_lock_outline_black_alpha</item>
         <item name="keyboard_control_36dp">@drawable/ic_keyboard_control_white_36dp</item>
         <item name="marker">@drawable/marker_dark</item>
         <item name="marker_race">@drawable/marker_race_dark</item>

mobile/com.sap.sailing.racecommittee.app/res/values/themes_light.xml

@@ -78,6 +78,7 @@
         <item name="create">@drawable/ic_create_light</item>
         <item name="compass_back">@drawable/compass_back_light</item>
         <item name="compass_needle">@drawable/compass_needle_light</item>
+        <item name="corner">@drawable/corner_light</item>
         <item name="course_triangle_48dp">@drawable/course_triangle_48dp_light</item>
         <item name="course_triangle_64dp">@drawable/course_triangle_64dp_light</item>
         <item name="course_updown_48dp">@drawable/course_updown_48dp_light</item>
@@ -86,8 +87,6 @@
         <item name="hearing">@drawable/ic_hearing_black</item>
         <item name="link_24dp">@drawable/ic_link_black_24dp</item>
         <item name="lock_outline">@drawable/ic_lock_outline_black</item>
-        <item name="lock_outline_alpha">@drawable/ic_lock_outline_black_more_alpha</item>
-        <item name="lock_outline_black">@drawable/ic_lock_outline_black_alpha</item>
         <item name="keyboard_control_36dp">@drawable/ic_keyboard_control_black_36dp</item>
         <item name="marker">@drawable/marker_light</item>
         <item name="marker_race">@drawable/marker_race_light</item>