diff --git a/OsmAnd/res/layout/gpx_track_item.xml b/OsmAnd/res/layout/gpx_track_item.xml
index 1766af34be..a62f652a8d 100644
--- a/OsmAnd/res/layout/gpx_track_item.xml
+++ b/OsmAnd/res/layout/gpx_track_item.xml
@@ -21,25 +21,17 @@
         android:paddingLeft="@dimen/dialog_content_margin"
         android:gravity="center_vertical">
 
-        <android.support.v7.widget.AppCompatCheckBox
-            android:id="@+id/toggle_checkbox_item"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingTop="4dp"
-            android:paddingBottom="4dp"
-            android:paddingRight="@dimen/dialog_content_margin"
-            android:clickable="false"
-            android:focusable="false"
-            android:focusableInTouchMode="false"
-            android:visibility="gone"/>
-
         <CheckBox
             android:id="@+id/check_local_index"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:focusable="false"
-            android:layout_marginRight="@dimen/list_content_padding"
-            android:visibility="gone"/>
+            android:visibility="gone"
+            android:paddingTop="4dp"
+            android:paddingBottom="4dp"
+            android:paddingRight="@dimen/dialog_content_margin"
+            android:clickable="false"
+            android:focusableInTouchMode="false"/>
 
         <ImageView
             android:id="@+id/icon"
@@ -197,6 +189,18 @@
                 android:paddingRight="@dimen/list_content_padding"
                 android:gravity="center_vertical"/>
 
+            <android.support.v7.widget.AppCompatCheckBox
+                android:id="@+id/toggle_checkbox_item"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingTop="4dp"
+                android:paddingBottom="4dp"
+                android:paddingRight="@dimen/dialog_content_margin"
+                android:clickable="false"
+                android:focusable="false"
+                android:focusableInTouchMode="false"
+                android:visibility="gone"/>
+
         </LinearLayout>
 
     </LinearLayout>
diff --git a/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java b/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
index a403a43f5c..c430e64f80 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
@@ -30,6 +30,7 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.ImageView;
@@ -473,7 +474,7 @@ public class GpxUiHelper {
 					v.findViewById(R.id.check_item).setVisibility(View.GONE);
 				} else {
 					if (checkLayout) {
-						final AppCompatCheckBox ch = ((AppCompatCheckBox) v.findViewById(R.id.toggle_checkbox_item));
+						final CheckBox ch = ((CheckBox) v.findViewById(R.id.check_local_index));
 						ch.setVisibility(View.VISIBLE);
 						v.findViewById(R.id.toggle_item).setVisibility(View.GONE);
 						ch.setOnCheckedChangeListener(null);