diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java
index 9c7ea6bd2..0430410e1 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java
@@ -144,12 +144,12 @@ public class ExportActivity extends FragmentActivity implements FileTypeDialogFr
                 String totalTracks = getResources()
                         .getQuantityString(R.plurals.tracks, totalTrackCount, totalTrackCount);
                 if (processedTrackCount == totalTrackCount) {
-                    iconId = R.drawable.ic_dialog_success;
+                    iconId = R.drawable.ic_dialog_success_24dp;
                     titleId = R.string.generic_success_title;
                     message = getString(
                             R.string.export_external_storage_success, totalTracks, directoryDisplayName);
                 } else {
-                    iconId = android.R.drawable.ic_dialog_alert;
+                    iconId = R.drawable.ic_dialog_error_24dp;
                     titleId = R.string.generic_error_title;
                     message = getString(R.string.export_external_storage_error, processedTrackCount, totalTracks,
                             directoryDisplayName);
diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java
index 57c1d4486..062b209a3 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java
@@ -145,16 +145,16 @@ public class ImportActivity extends FragmentActivity implements FileTypeDialogFr
                         .getQuantityString(R.plurals.files, totalTrackCount, totalTrackCount);
                 if (importedTrackCount == totalTrackCount) {
                     if (totalTrackCount == 0) {
-                        iconId = android.R.drawable.ic_dialog_info;
+                        iconId = R.drawable.ic_dialog_info_24dp;
                         titleId = R.string.import_no_file_title;
                         message = getString(R.string.import_no_file, directoryDisplayName);
                     } else {
-                        iconId = R.drawable.ic_dialog_success;
+                        iconId = R.drawable.ic_dialog_success_24dp;
                         titleId = R.string.generic_success_title;
                         message = getString(R.string.import_success, totalFiles, directoryDisplayName);
                     }
                 } else {
-                    iconId = android.R.drawable.ic_dialog_alert;
+                    iconId = R.drawable.ic_dialog_error_24dp;
                     titleId = R.string.generic_error_title;
                     message = getString(
                             R.string.import_error, importedTrackCount, totalFiles, directoryDisplayName);
diff --git a/src/main/java/de/dennisguse/opentracks/util/DialogUtils.java b/src/main/java/de/dennisguse/opentracks/util/DialogUtils.java
index d350831ec..f615eac85 100644
--- a/src/main/java/de/dennisguse/opentracks/util/DialogUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/DialogUtils.java
@@ -100,7 +100,7 @@ public class DialogUtils {
         final ProgressDialog progressDialog = new ProgressDialog(context);
         progressDialog.setCancelable(true);
         progressDialog.setCanceledOnTouchOutside(false);
-        progressDialog.setIcon(android.R.drawable.ic_dialog_info);
+        progressDialog.setIcon(R.drawable.ic_dialog_info_24dp);
         progressDialog.setIndeterminate(true);
         progressDialog.setMessage(context.getString(messageId, formatArgs));
         progressDialog.setOnCancelListener(onCancelListener);
diff --git a/src/main/res/drawable-hdpi/ic_dialog_success.png b/src/main/res/drawable-hdpi/ic_dialog_success.png
deleted file mode 100644
index b8c44dc7f..000000000
Binary files a/src/main/res/drawable-hdpi/ic_dialog_success.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_dialog_success.png b/src/main/res/drawable-mdpi/ic_dialog_success.png
deleted file mode 100644
index 6079bd642..000000000
Binary files a/src/main/res/drawable-mdpi/ic_dialog_success.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_dialog_success.png b/src/main/res/drawable-xhdpi/ic_dialog_success.png
deleted file mode 100644
index 05bf5aa90..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_dialog_success.png and /dev/null differ
diff --git a/src/main/res/drawable/ic_dialog_error_24dp.xml b/src/main/res/drawable/ic_dialog_error_24dp.xml
new file mode 100644
index 000000000..d191ba926
--- /dev/null
+++ b/src/main/res/drawable/ic_dialog_error_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_dialog_info_24dp.xml b/src/main/res/drawable/ic_dialog_info_24dp.xml
new file mode 100644
index 000000000..7be014728
--- /dev/null
+++ b/src/main/res/drawable/ic_dialog_info_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_dialog_success_24dp.xml b/src/main/res/drawable/ic_dialog_success_24dp.xml
new file mode 100644
index 000000000..7cdc15de0
--- /dev/null
+++ b/src/main/res/drawable/ic_dialog_success_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/>
+</vector>