diff --git a/OsmAnd/res/layout/map_hud_widget.xml b/OsmAnd/res/layout/map_hud_widget.xml
index 3c18b0e783..689e3b0372 100644
--- a/OsmAnd/res/layout/map_hud_widget.xml
+++ b/OsmAnd/res/layout/map_hud_widget.xml
@@ -52,63 +52,77 @@
             android:gravity="center"
             android:src="@drawable/ic_action_test_light"/>
 
-        <FrameLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:layout_marginBottom="@dimen/map_widget_text_bottom_margin"
-            android:layout_marginLeft="@dimen/map_widget_icon_margin"
-            android:layout_marginRight="@dimen/map_widget_icon_margin"
-            android:layout_weight="1">
-
-            <TextView
-                android:id="@+id/widget_text_shadow"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                android:maxLines="1"
-                android:minWidth="10dp"
-                android:textColor="@color/color_white"
-                android:textSize="@dimen/map_widget_text_size"
-                tools:text="1048"/>
-
-            <TextView
-                android:id="@+id/widget_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                android:maxLines="1"
-                android:minWidth="10dp"
-                android:textColor="@color/color_black"
-                android:textSize="@dimen/map_widget_text_size"
-                tools:text="1048"/>
-        </FrameLayout>
-
         <FrameLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:layout_marginBottom="@dimen/map_widget_text_small_bottom_margin"
-            android:layout_marginLeft="4dp"
-            android:layout_marginRight="4dp">
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="4dp"
+            android:layout_marginLeft="@dimen/map_widget_icon_margin"
+            android:layout_marginRight="4dp"
+            android:layout_marginStart="@dimen/map_widget_icon_margin">
 
-            <TextView
-                android:id="@+id/widget_text_small_shadow"
+            <RelativeLayout
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxLines="1"
-                android:textColor="@color/color_white"
-                android:textSize="@dimen/map_widget_text_size_small"
-                tools:text="km"/>
+                android:layout_height="wrap_content">
 
-            <TextView
-                android:id="@+id/widget_text_small"
+                <TextView
+                    android:id="@+id/widget_text_shadow"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="@dimen/map_widget_icon_margin"
+                    android:layout_marginRight="@dimen/map_widget_icon_margin"
+                    android:maxLines="1"
+                    android:minWidth="10dp"
+                    android:textColor="@color/color_white"
+                    android:textSize="@dimen/map_widget_text_size"
+                    tools:text="1048"/>
+
+                <TextView
+                    android:id="@+id/widget_text_small_shadow"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignBaseline="@+id/widget_text_shadow"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginStart="4dp"
+                    android:layout_toEndOf="@+id/widget_text_shadow"
+                    android:layout_toRightOf="@+id/widget_text_shadow"
+                    android:maxLines="1"
+                    android:textColor="@color/color_white"
+                    android:textSize="@dimen/map_widget_text_size_small"
+                    tools:text="km"/>
+            </RelativeLayout>
+
+            <RelativeLayout
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxLines="1"
-                android:textColor="@color/color_black"
-                android:textSize="@dimen/map_widget_text_size_small"
-                tools:text="km"/>
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:id="@+id/widget_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="@dimen/map_widget_icon_margin"
+                    android:layout_marginRight="@dimen/map_widget_icon_margin"
+                    android:maxLines="1"
+                    android:minWidth="10dp"
+                    android:textColor="@color/color_black"
+                    android:textSize="@dimen/map_widget_text_size"
+                    tools:text="1048"/>
+
+                <TextView
+                    android:id="@+id/widget_text_small"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignBaseline="@+id/widget_text"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginStart="4dp"
+                    android:layout_toEndOf="@+id/widget_text"
+                    android:layout_toRightOf="@+id/widget_text"
+                    android:maxLines="1"
+                    android:textColor="@color/color_black"
+                    android:textSize="@dimen/map_widget_text_size_small"
+                    tools:text="km"/>
+            </RelativeLayout>
+
         </FrameLayout>
 
     </LinearLayout>