diff --git a/OsmAnd/res/layout/gpx_item_altitude.xml b/OsmAnd/res/layout/gpx_item_altitude.xml
index f0a2511519..98eefe504a 100644
--- a/OsmAnd/res/layout/gpx_item_altitude.xml
+++ b/OsmAnd/res/layout/gpx_item_altitude.xml
@@ -22,6 +22,7 @@
             android:id="@+id/gpx_join_gaps_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
             android:minHeight="@dimen/card_row_min_height"
             android:orientation="horizontal">
 
diff --git a/OsmAnd/res/layout/gpx_item_general.xml b/OsmAnd/res/layout/gpx_item_general.xml
index f98049b06c..3ac0f8f529 100644
--- a/OsmAnd/res/layout/gpx_item_general.xml
+++ b/OsmAnd/res/layout/gpx_item_general.xml
@@ -22,6 +22,7 @@
             android:id="@+id/gpx_join_gaps_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
             android:minHeight="@dimen/card_row_min_height"
             android:orientation="horizontal">
 
diff --git a/OsmAnd/res/layout/gpx_item_list_header.xml b/OsmAnd/res/layout/gpx_item_list_header.xml
index cf4990ba48..45e7da9cbb 100644
--- a/OsmAnd/res/layout/gpx_item_list_header.xml
+++ b/OsmAnd/res/layout/gpx_item_list_header.xml
@@ -53,8 +53,10 @@
         android:background="?attr/bg_color">
 
         <LinearLayout
+            android:id="@+id/showOnMapContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
             android:orientation="horizontal"
             android:gravity="center_vertical">
 
diff --git a/OsmAnd/res/layout/gpx_item_speed.xml b/OsmAnd/res/layout/gpx_item_speed.xml
index 4203be447c..bf5ff46f87 100644
--- a/OsmAnd/res/layout/gpx_item_speed.xml
+++ b/OsmAnd/res/layout/gpx_item_speed.xml
@@ -22,6 +22,7 @@
             android:id="@+id/gpx_join_gaps_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
             android:minHeight="@dimen/card_row_min_height"
             android:orientation="horizontal">
 
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
index fe907e54f8..d0c48c3eb4 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
@@ -716,11 +716,10 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit
 							((ImageView) view.findViewById(R.id.end_time_icon))
 									.setImageDrawable(ic.getThemedIcon(R.drawable.ic_action_time_end));
 
-							final SwitchCompat joinGapsSwitch = (SwitchCompat) view.findViewById(R.id.gpx_join_gaps_switch);
-							joinGapsSwitch.setOnClickListener(new View.OnClickListener() {
+							view.findViewById(R.id.gpx_join_gaps_container).setOnClickListener(new View.OnClickListener() {
 								@Override
 								public void onClick(View v) {
-									joinGapsEnabled = joinGapsSwitch.isChecked();
+									joinGapsEnabled = !joinGapsEnabled;
 									for (int i = 0; i < getCount(); i++) {
 										View view = getViewAtPosition(i);
 										updateJoinGapsInfo(view, i);
@@ -854,11 +853,10 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit
 							((TextView) view.findViewById(R.id.ascent_text)).setText(asc);
 							((TextView) view.findViewById(R.id.descent_text)).setText(desc);
 
-							final SwitchCompat joinGapsSwitch = (SwitchCompat) view.findViewById(R.id.gpx_join_gaps_switch);
-							joinGapsSwitch.setOnClickListener(new View.OnClickListener() {
+							view.findViewById(R.id.gpx_join_gaps_container).setOnClickListener(new View.OnClickListener() {
 								@Override
 								public void onClick(View v) {
-									joinGapsEnabled = joinGapsSwitch.isChecked();
+									joinGapsEnabled = !joinGapsEnabled;
 									for (int i = 0; i < getCount(); i++) {
 										View view = getViewAtPosition(i);
 										updateJoinGapsInfo(view, i);
@@ -961,11 +959,10 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit
 							((TextView) view.findViewById(R.id.average_text)).setText(avg);
 							((TextView) view.findViewById(R.id.max_text)).setText(max);
 
-							final SwitchCompat joinGapsSwitch = (SwitchCompat) view.findViewById(R.id.gpx_join_gaps_switch);
-							joinGapsSwitch.setOnClickListener(new View.OnClickListener() {
+							view.findViewById(R.id.gpx_join_gaps_container).setOnClickListener(new View.OnClickListener() {
 								@Override
 								public void onClick(View v) {
-									joinGapsEnabled = joinGapsSwitch.isChecked();
+									joinGapsEnabled = !joinGapsEnabled;
 									for (int i = 0; i < getCount(); i++) {
 										View view = getViewAtPosition(i);
 										updateJoinGapsInfo(view, i);