diff --git a/src/main/java/de/dennisguse/opentracks/chart/ChartView.java b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java
index 3a5a0d05d..ad4b6bd74 100644
--- a/src/main/java/de/dennisguse/opentracks/chart/ChartView.java
+++ b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java
@@ -33,6 +33,7 @@ import android.view.View;
 import android.widget.Scroller;
 
 import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 import androidx.core.view.GestureDetectorCompat;
 
 import java.text.NumberFormat;
@@ -114,7 +115,7 @@ public class ChartView extends View {
     private int effectiveWidth = 0;
     private int effectiveHeight = 0;
 
-    private boolean chartByDistance;
+    private final boolean chartByDistance;
     private boolean metricUnits = true;
     private boolean reportSpeed = true;
     private boolean showPointer = false;
@@ -330,7 +331,7 @@ public class ChartView extends View {
         markerPaint.setStyle(Style.STROKE);
         markerPaint.setAntiAlias(false);
 
-        pointer = context.getResources().getDrawable(R.drawable.ic_logo_color_24dp);
+        pointer = ContextCompat.getDrawable(context, R.drawable.ic_logo_color_24dp);
         pointer.setBounds(0, 0, pointer.getIntrinsicWidth(), pointer.getIntrinsicHeight());
 
         markerPin = MarkerUtils.getDefaultPhoto(context);
diff --git a/src/main/java/de/dennisguse/opentracks/util/MarkerUtils.java b/src/main/java/de/dennisguse/opentracks/util/MarkerUtils.java
index 11aa6f4e0..096a40a07 100644
--- a/src/main/java/de/dennisguse/opentracks/util/MarkerUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/MarkerUtils.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.graphics.drawable.Drawable;
 
 import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 
 import de.dennisguse.opentracks.R;
 
@@ -15,6 +16,6 @@ public class MarkerUtils {
     }
 
     public static Drawable getDefaultPhoto(@NonNull Context context) {
-        return context.getResources().getDrawable(ICON_ID);
+        return ContextCompat.getDrawable(context, ICON_ID);
     }
 }
diff --git a/src/main/res/values/themes_custom.xml b/src/main/res/values/themes_custom.xml
index 950b1e793..e3e462483 100644
--- a/src/main/res/values/themes_custom.xml
+++ b/src/main/res/values/themes_custom.xml
@@ -25,16 +25,7 @@ limitations under the License.
         <item name="windowActionModeOverlay">true</item>
     </style>
 
-    <style name="ThemeCustomNotTransparentDialog" parent="ThemeCustom">
-        <!-- TODO Remove when moving to settings to fragments. -->
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:backgroundDimEnabled">true</item>
-    </style>
-
     <style name="TrackDeleteActivity" parent="ThemeCustom">
-        <!-- TODO Remove when moving to TrackDeleteActivity to fragments. -->
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowIsFloating">true</item>