diff --git a/src/main/java/de/dennisguse/opentracks/ui/TrackListAdapter.java b/src/main/java/de/dennisguse/opentracks/ui/TrackListAdapter.java
index 9d2bb365a..fde4f1f24 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/TrackListAdapter.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/TrackListAdapter.java
@@ -163,7 +163,6 @@ public class TrackListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
     public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
 
         private final TrackListItemBinding viewBinding;
-        private final View view;
 
         private Track.Id trackId;
 
@@ -171,10 +170,9 @@ public class TrackListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
             super(itemView);
 
             viewBinding = TrackListItemBinding.bind(itemView);
-            view = itemView;
 
-            view.setOnClickListener(this);
-            view.setOnLongClickListener(this);
+            viewBinding.getRoot().setOnClickListener(this);
+            viewBinding.getRoot().setOnLongClickListener(this);
         }
 
 
@@ -233,7 +231,7 @@ public class TrackListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 
         public void setSelected(boolean isSelected) {
             selection.put((int) getId(), isSelected);
-            view.setActivated(isSelected);
+            viewBinding.getRoot().setActivated(isSelected);
         }
 
         public long getId() {
@@ -244,7 +242,7 @@ public class TrackListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
         @Override
         public void onClick(View v) {
             if (selectionMode) {
-                setSelected(!view.isActivated());
+                setSelected(!viewBinding.getRoot().isActivated());
                 actionMode.invalidate();
                 return;
             }
@@ -260,14 +258,14 @@ public class TrackListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
                         .putExtra(TrackRecordedActivity.EXTRA_TRACK_ID, trackId);
                 ActivityOptions activityOptions = ActivityOptions.makeSceneTransitionAnimation(
                         context,
-                        new Pair<>(view.findViewById(R.id.track_list_item_icon), TrackRecordedActivity.VIEW_TRACK_ICON));
+                        new Pair<>(viewBinding.getRoot().findViewById(R.id.track_list_item_icon), TrackRecordedActivity.VIEW_TRACK_ICON));
                 context.startActivity(newIntent, activityOptions.toBundle());
             }
         }
 
         @Override
         public boolean onLongClick(View v) {
-            setSelected(!view.isActivated());
+            setSelected(!viewBinding.getRoot().isActivated());
             if (!selectionMode) {
                 actionMode = context.startSupportActionMode(TrackListAdapter.this);
             } else {
diff --git a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListAdapter.java b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListAdapter.java
index 9a5aeb248..5f345f0ea 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListAdapter.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListAdapter.java
@@ -164,7 +164,6 @@ public class MarkerListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
 
         private final MarkerListItemBinding viewBinding;
-        private final View view;
 
         private Marker marker;
 
@@ -172,23 +171,20 @@ public class MarkerListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
             super(view);
 
             viewBinding = MarkerListItemBinding.bind(view);
-            this.view = view;
 
-            view.setOnClickListener(this);
-            view.setOnLongClickListener(this);
+            viewBinding.getRoot().setOnClickListener(this);
+            viewBinding.getRoot().setOnLongClickListener(this);
         }
 
         public void bind(Marker marker) {
             this.marker = marker;
 
             viewBinding.markerListItemPhoto.setVisibility(marker.hasPhoto() ? View.VISIBLE : View.GONE);
-            viewBinding.markerListItemTextGradient.setVisibility(marker.hasPhoto() ? View.VISIBLE : View.GONE);
             if (marker.hasPhoto()) {
                 int height = ThemeUtils.getPhotoHeight(context);
                 ViewGroup.LayoutParams params = viewBinding.markerListItemPhoto.getLayoutParams();
                 params.height = height;
                 viewBinding.markerListItemPhoto.setLayoutParams(params);
-                viewBinding.markerListItemTextGradient.setLayoutParams(params);
 
                 asyncLoadPhoto(viewBinding.markerListItemPhoto, marker.getPhotoUrl(), marker.getId());
             }
@@ -208,7 +204,7 @@ public class MarkerListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
         public void setSelected(boolean isSelected) {
             selection.put((int) getId(), isSelected);
-            view.setActivated(isSelected);
+            viewBinding.getRoot().setActivated(isSelected);
         }
 
         public long getId() {