diff --git a/OsmAnd/res/layout/dialog_list_item_with_compound_button.xml b/OsmAnd/res/layout/dialog_list_item_with_compound_button.xml
index 53ca8d39a7..809d19fabc 100644
--- a/OsmAnd/res/layout/dialog_list_item_with_compound_button.xml
+++ b/OsmAnd/res/layout/dialog_list_item_with_compound_button.xml
@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_height="wrap_content"
 	android:layout_width="match_parent"
+	xmlns:tools="http://schemas.android.com/tools"
 	android:orientation="vertical">
 
 	<View
@@ -58,7 +59,7 @@
 			android:layout_gravity="center_vertical|start"
 			android:textColor="?android:textColorPrimary"
 			android:textSize="@dimen/default_list_text_size_large"
-			android:text="Item title"/>
+			tools:text="Item title"/>
 		
 	</LinearLayout>
 
diff --git a/OsmAnd/res/layout/drawer_list_radius_ex.xml b/OsmAnd/res/layout/drawer_list_radius_ex.xml
index 4c84dacfd3..de6fb3fd54 100644
--- a/OsmAnd/res/layout/drawer_list_radius_ex.xml
+++ b/OsmAnd/res/layout/drawer_list_radius_ex.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="horizontal"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:paddingLeft="16dp"
-              android:paddingRight="16dp"
-              android:minHeight="50dp"
-              android:layout_marginBottom="5dp"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:orientation="horizontal"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:paddingLeft="16dp"
+	android:paddingRight="16dp"
+	android:minHeight="50dp"
+	android:layout_marginBottom="5dp"
 	android:paddingStart="16dp"
 	android:paddingEnd="16dp">
 
@@ -69,7 +70,7 @@
             android:textColor="@color/color_myloc_distance"
             android:layout_gravity="center_vertical"
             android:layout_marginTop="2dp"
-            android:text="Cinema"
+            tools:text="Cinema"
             android:layout_marginRight="16dp"
 	        android:layout_marginEnd="16dp" />
 
diff --git a/OsmAnd/res/layout/open_bug.xml b/OsmAnd/res/layout/open_bug.xml
index 1a69405a48..94c2a40798 100644
--- a/OsmAnd/res/layout/open_bug.xml
+++ b/OsmAnd/res/layout/open_bug.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-              android:orientation="vertical"
-              android:paddingLeft="?dialogPreferredPadding"
-              android:paddingRight="?dialogPreferredPadding"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:orientation="vertical"
+	android:paddingLeft="?dialogPreferredPadding"
+	android:paddingRight="?dialogPreferredPadding"
 	android:paddingStart="?dialogPreferredPadding"
 	android:paddingEnd="?dialogPreferredPadding">
 
@@ -32,7 +33,7 @@
         android:id="@+id/user_name_field"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:text="NoName"/>
+        tools:text="NoName"/>
 
 
     <TextView
diff --git a/OsmAnd/res/layout/search_poi_filter.xml b/OsmAnd/res/layout/search_poi_filter.xml
index 1699c4ac10..119c662e93 100644
--- a/OsmAnd/res/layout/search_poi_filter.xml
+++ b/OsmAnd/res/layout/search_poi_filter.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              xmlns:osmand="http://schemas.android.com/apk/res-auto"
-              android:orientation="vertical">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -51,7 +52,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="8dp"
                         android:background="@null"
-                        android:text="Filling station"
+                        tools:text="Filling station"
                         android:textColor="@color/color_white"
                         android:textSize="@dimen/default_desc_text_size"/>
 
diff --git a/OsmAnd/res/layout/split_segments_layout.xml b/OsmAnd/res/layout/split_segments_layout.xml
index c4a5d809d9..84f36602fc 100644
--- a/OsmAnd/res/layout/split_segments_layout.xml
+++ b/OsmAnd/res/layout/split_segments_layout.xml
@@ -94,7 +94,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:background="@null"
-                        android:text="Split interval:"
+                        tools:text="Split interval:"
                         android:textColor="?android:attr/textColorPrimary"
                         android:textSize="@dimen/default_desc_text_size"
                         osmand:typeface="@string/font_roboto_medium" />
diff --git a/OsmAnd/res/layout/subscription_fragment.xml b/OsmAnd/res/layout/subscription_fragment.xml
index ad308e6be1..5deb8207c2 100644
--- a/OsmAnd/res/layout/subscription_fragment.xml
+++ b/OsmAnd/res/layout/subscription_fragment.xml
@@ -2,6 +2,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:background="?attr/spinnerListBackground"
     android:orientation="vertical">
 
@@ -212,7 +213,7 @@
                                     android:paddingLeft="2dp"
                                     android:paddingEnd="0dp"
                                     android:paddingRight="0dp"
-                                    android:text="Ukraine"
+                                    tools:text="Ukraine"
                                     app:drawableEndCompat="@drawable/ic_action_arrow_drop_down"
                                     app:drawableRightCompat="@drawable/ic_action_arrow_drop_down" />
 
diff --git a/OsmAnd/res/layout/switch_select_list_item.xml b/OsmAnd/res/layout/switch_select_list_item.xml
index d362ff05f2..7c76fc5dec 100644
--- a/OsmAnd/res/layout/switch_select_list_item.xml
+++ b/OsmAnd/res/layout/switch_select_list_item.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:osmand="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:minHeight="48dp"
-    android:orientation="horizontal"
-    android:paddingLeft="@dimen/list_content_padding"
-    android:paddingRight="@dimen/list_content_padding"
+<LinearLayout xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:gravity="center_vertical"
+	android:minHeight="48dp"
+	android:orientation="horizontal"
+	android:paddingLeft="@dimen/list_content_padding"
+	android:paddingRight="@dimen/list_content_padding"
 	android:paddingEnd="@dimen/list_content_padding"
 	android:paddingStart="@dimen/list_content_padding">
 
@@ -36,7 +36,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:text="Avoid selected roads"
+            tools:text="Avoid selected roads"
             android:textSize="@dimen/default_list_text_size"/>
 
         <TextView
@@ -44,7 +44,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:text="Select roads you want to avoid during navigation"
+            tools:text="Select roads you want to avoid during navigation"
             android:textSize="@dimen/default_desc_text_size"/>
 
     </LinearLayout>
diff --git a/OsmAnd/res/layout/test_backup_layout.xml b/OsmAnd/res/layout/test_backup_layout.xml
index 216820a9bf..384b549ebb 100644
--- a/OsmAnd/res/layout/test_backup_layout.xml
+++ b/OsmAnd/res/layout/test_backup_layout.xml
@@ -117,7 +117,7 @@
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginTop="@dimen/content_padding"
-				android:text="Actions"
+				tools:text="Actions"
 				android:textColor="?android:textColorPrimary"
 				android:textSize="@dimen/default_list_text_size" />
 
diff --git a/OsmAnd/res/layout/undo_popup.xml b/OsmAnd/res/layout/undo_popup.xml
index 3a4b81702f..c427c95346 100644
--- a/OsmAnd/res/layout/undo_popup.xml
+++ b/OsmAnd/res/layout/undo_popup.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-              android:background="@drawable/popup_bg"
-              android:gravity="center"
-              android:orientation="horizontal">
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:background="@drawable/popup_bg"
+	android:gravity="center"
+	android:orientation="horizontal">
 
     <TextView
         android:id="@+id/text"
@@ -37,6 +38,6 @@
         android:layout_height="wrap_content"
         android:layout_weight="0"
         android:background="?attr/selectableItemBackground"
-        android:text="UNDO"
+        tools:text="UNDO"
         android:textColor="@color/popup_text_color"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentDialogFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentDialogFragment.java
index c981610015..5ec7077718 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentDialogFragment.java
@@ -287,6 +287,8 @@ public class SplitSegmentDialogFragment extends DialogFragment {
 		}
 		int color = app.getResources().getColor(colorId);
 		title.setTextColor(color);
+		String titleText = getString(R.string.gpx_split_interval);
+		title.setText(getString(R.string.ltr_or_rtl_combine_via_colon, titleText, ""));
 		text.setTextColor(color);
 		img.setImageDrawable(ic.getIcon(R.drawable.ic_action_arrow_drop_down, colorId));
 	}