vector icons

app/build.gradle

@@ -14,6 +14,7 @@ android {
         targetSdkVersion 26
         versionCode 140200
         versionName "0.14.2"
+        vectorDrawables.useSupportLibrary = true
         ndk {
             abiFilters 'armeabi-v7a', 'x86'
         }

app/src/main/java/org/emunix/unipatcher/WorkerService.java

@@ -329,7 +329,7 @@ public class WorkerService extends IntentService {
         Notification notify = new NotificationCompat.Builder(this, UniPatcher.NOTIFICATION_CHANNEL_ID)
                 .setContentTitle(getString(R.string.notify_error))
                 .setContentText(text)
-                .setSmallIcon(R.drawable.ic_stat_patching)
+                .setSmallIcon(R.drawable.ic_gamepad_variant_white_24dp)
                 .setContentIntent(PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_CANCEL_CURRENT))
                 .setAutoCancel(true)
                 .setStyle(new NotificationCompat.BigTextStyle()

app/src/main/java/org/emunix/unipatcher/ui/activity/FilePickerActivity.java

@@ -204,7 +204,7 @@ public class FilePickerActivity extends AppCompatActivity implements FilePickerA
 
         if (currentDir.getParent() != null && currentDir.getParentFile().canRead()) {
             entry = new FileEntry();
-            entry.setIcon(R.drawable.ic_folder_upload_grey600_24dp);
+            entry.setIcon(R.drawable.folder_upload);
             entry.setName("..");
             fileList.add(entry);
         }
@@ -214,15 +214,15 @@ public class FilePickerActivity extends AppCompatActivity implements FilePickerA
                 continue;
             if (file.isDirectory()) {
                 entry = new FileEntry();
-                entry.setIcon(R.drawable.ic_folder_grey600_24dp);
+                entry.setIcon(R.drawable.folder);
                 entry.setName(file.getName());
                 fileList.add(entry);
             } else {
                 entry = new FileEntry();
                 if (Utils.isPatch(file)) {
-                    entry.setIcon(R.drawable.ic_healing_grey600_24dp);
+                    entry.setIcon(R.drawable.healing);
                 } else {
-                    entry.setIcon(R.drawable.ic_insert_drive_file_grey600_24dp);
+                    entry.setIcon(R.drawable.file);
                 }
                 entry.setName(file.getName());
                 fileList.add(entry);

app/src/main/java/org/emunix/unipatcher/ui/notify/CreatePatchNotify.java

@@ -29,7 +29,7 @@ public class CreatePatchNotify extends Notify {
 
     public CreatePatchNotify(Context c, String text) {
         super(c);
-        notifyBuilder.setSmallIcon(R.drawable.ic_stat_patching);
+        notifyBuilder.setSmallIcon(R.drawable.ic_gamepad_variant_white_24dp);
         notifyBuilder.setContentTitle(context.getString(R.string.notify_creating_patch));
         notifyBuilder.setContentText(text);
         notifyBuilder.setStyle(new NotificationCompat.BigTextStyle().bigText(text));

app/src/main/java/org/emunix/unipatcher/ui/notify/PatchingNotify.java

@@ -28,7 +28,7 @@ public class PatchingNotify extends Notify {
 
     public PatchingNotify(Context c, String text) {
         super(c);
-        notifyBuilder.setSmallIcon(R.drawable.ic_stat_patching);
+        notifyBuilder.setSmallIcon(R.drawable.ic_gamepad_variant_white_24dp);
         notifyBuilder.setContentTitle(context.getString(R.string.notify_applying_patch));
         notifyBuilder.setContentText(text);
         notifyBuilder.setStyle(new NotificationCompat.BigTextStyle().bigText(text));

app/src/main/java/org/emunix/unipatcher/ui/notify/SmdFixChecksumNotify.java

@@ -28,7 +28,7 @@ public class SmdFixChecksumNotify extends Notify {
 
     public SmdFixChecksumNotify(Context c, String text) {
         super(c);
-        notifyBuilder.setSmallIcon(R.drawable.ic_stat_patching);
+        notifyBuilder.setSmallIcon(R.drawable.ic_gamepad_variant_white_24dp);
         notifyBuilder.setContentTitle(context.getString(R.string.notify_smd_fix_checksum_in_progress));
         notifyBuilder.setContentText(text);
         notifyBuilder.setStyle(new NotificationCompat.BigTextStyle().bigText(text));

app/src/main/java/org/emunix/unipatcher/ui/notify/SnesAddSmcHeaderNotify.java

@@ -27,7 +27,7 @@ import org.emunix.unipatcher.R;
 public class SnesAddSmcHeaderNotify extends Notify {
     public SnesAddSmcHeaderNotify(Context c, String text) {
         super(c);
-        notifyBuilder.setSmallIcon(R.drawable.ic_stat_patching);
+        notifyBuilder.setSmallIcon(R.drawable.ic_gamepad_variant_white_24dp);
         notifyBuilder.setContentTitle(context.getString(R.string.notify_snes_add_smc_header_in_progress));
         notifyBuilder.setContentText(text);
         notifyBuilder.setStyle(new NotificationCompat.BigTextStyle().bigText(text));

app/src/main/java/org/emunix/unipatcher/ui/notify/SnesDeleteSmcHeaderNotify.java

@@ -27,7 +27,7 @@ import org.emunix.unipatcher.R;
 public class SnesDeleteSmcHeaderNotify extends Notify {
     public SnesDeleteSmcHeaderNotify(Context c, String text) {
         super(c);
-        notifyBuilder.setSmallIcon(R.drawable.ic_stat_patching);
+        notifyBuilder.setSmallIcon(R.drawable.ic_gamepad_variant_white_24dp);
         notifyBuilder.setContentTitle(context.getString(R.string.notify_snes_delete_smc_header_in_progress));
         notifyBuilder.setContentText(text);
         notifyBuilder.setStyle(new NotificationCompat.BigTextStyle().bigText(text));

app/src/main/res/drawable/content_cut.xml

@@ -0,0 +1,8 @@
+<!-- drawable/content_cut.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#000" android:pathData="M19,3L13,9L15,11L22,4V3M12,12.5A0.5,0.5 0 0,1 11.5,12A0.5,0.5 0 0,1 12,11.5A0.5,0.5 0 0,1 12.5,12A0.5,0.5 0 0,1 12,12.5M6,20A2,2 0 0,1 4,18C4,16.89 4.9,16 6,16A2,2 0 0,1 8,18C8,19.11 7.1,20 6,20M6,8A2,2 0 0,1 4,6C4,4.89 4.9,4 6,4A2,2 0 0,1 8,6C8,7.11 7.1,8 6,8M9.64,7.64C9.87,7.14 10,6.59 10,6A4,4 0 0,0 6,2A4,4 0 0,0 2,6A4,4 0 0,0 6,10C6.59,10 7.14,9.87 7.64,9.64L10,12L7.64,14.36C7.14,14.13 6.59,14 6,14A4,4 0 0,0 2,18A4,4 0 0,0 6,22A4,4 0 0,0 10,18C10,17.41 9.87,16.86 9.64,16.36L12,14L19,21H22V20L9.64,7.64Z" />
+</vector>

app/src/main/res/drawable/content_save.xml

@@ -0,0 +1,8 @@
+<!-- drawable/content_save.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#fff" android:pathData="M15,9H5V5H15M12,19A3,3 0 0,1 9,16A3,3 0 0,1 12,13A3,3 0 0,1 15,16A3,3 0 0,1 12,19M17,3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V7L17,3Z" />
+</vector>

app/src/main/res/drawable/file.xml

@@ -0,0 +1,8 @@
+<!-- drawable/file.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#000" android:pathData="M13,9V3.5L18.5,9M6,2C4.89,2 4,2.89 4,4V20A2,2 0 0,0 6,22H18A2,2 0 0,0 20,20V8L14,2H6Z" />
+</vector>

app/src/main/res/drawable/fingerprint.xml

@@ -0,0 +1,8 @@
+<!-- drawable/fingerprint.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#000" android:pathData="M11.83,1.73C8.43,1.79 6.23,3.32 6.23,3.32C5.95,3.5 5.88,3.91 6.07,4.19C6.27,4.5 6.66,4.55 6.96,4.34C6.96,4.34 11.27,1.15 17.46,4.38C17.75,4.55 18.14,4.45 18.31,4.15C18.5,3.85 18.37,3.47 18.03,3.28C16.36,2.4 14.78,1.96 13.36,1.8C12.83,1.74 12.32,1.72 11.83,1.73M12.22,4.34C6.26,4.26 3.41,9.05 3.41,9.05C3.22,9.34 3.3,9.72 3.58,9.91C3.87,10.1 4.26,10 4.5,9.68C4.5,9.68 6.92,5.5 12.2,5.59C17.5,5.66 19.82,9.65 19.82,9.65C20,9.94 20.38,10.04 20.68,9.87C21,9.69 21.07,9.31 20.9,9C20.9,9 18.15,4.42 12.22,4.34M11.5,6.82C9.82,6.94 8.21,7.55 7,8.56C4.62,10.53 3.1,14.14 4.77,19C4.88,19.33 5.24,19.5 5.57,19.39C5.89,19.28 6.07,18.92 5.95,18.6V18.6C4.41,14.13 5.78,11.2 7.8,9.5C9.77,7.89 13.25,7.5 15.84,9.1C17.11,9.9 18.1,11.28 18.6,12.64C19.11,14 19.08,15.32 18.67,15.94C18.25,16.59 17.4,16.83 16.65,16.64C15.9,16.45 15.29,15.91 15.26,14.77C15.23,13.06 13.89,12 12.5,11.84C11.16,11.68 9.61,12.4 9.21,14C8.45,16.92 10.36,21.07 14.78,22.45C15.11,22.55 15.46,22.37 15.57,22.04C15.67,21.71 15.5,21.35 15.15,21.25C11.32,20.06 9.87,16.43 10.42,14.29C10.66,13.33 11.5,13 12.38,13.08C13.25,13.18 14,13.7 14,14.79C14.05,16.43 15.12,17.54 16.34,17.85C17.56,18.16 18.97,17.77 19.72,16.62C20.5,15.45 20.37,13.8 19.78,12.21C19.18,10.61 18.07,9.03 16.5,8.04C14.96,7.08 13.19,6.7 11.5,6.82M11.86,9.25V9.26C10.08,9.32 8.3,10.24 7.28,12.18C5.96,14.67 6.56,17.21 7.44,19.04C8.33,20.88 9.54,22.1 9.54,22.1C9.78,22.35 10.17,22.35 10.42,22.11C10.67,21.87 10.67,21.5 10.43,21.23C10.43,21.23 9.36,20.13 8.57,18.5C7.78,16.87 7.3,14.81 8.38,12.77C9.5,10.67 11.5,10.16 13.26,10.67C15.04,11.19 16.53,12.74 16.5,15.03C16.46,15.38 16.71,15.68 17.06,15.7C17.4,15.73 17.7,15.47 17.73,15.06C17.79,12.2 15.87,10.13 13.61,9.47C13.04,9.31 12.45,9.23 11.86,9.25M12.08,14.25C11.73,14.26 11.46,14.55 11.47,14.89C11.47,14.89 11.5,16.37 12.31,17.8C13.15,19.23 14.93,20.59 18.03,20.3C18.37,20.28 18.64,20 18.62,19.64C18.6,19.29 18.3,19.03 17.91,19.06C15.19,19.31 14.04,18.28 13.39,17.17C12.74,16.07 12.72,14.88 12.72,14.88C12.72,14.53 12.44,14.25 12.08,14.25Z" />
+</vector>

app/src/main/res/drawable/folder.xml

@@ -0,0 +1,8 @@
+<!-- drawable/folder.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#000" android:pathData="M10,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8C22,6.89 21.1,6 20,6H12L10,4Z" />
+</vector>

app/src/main/res/drawable/folder_upload.xml

@@ -0,0 +1,8 @@
+<!-- drawable/folder_upload.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#000" android:pathData="M20,6A2,2 0 0,1 22,8V18A2,2 0 0,1 20,20H4A2,2 0 0,1 2,18V6A2,2 0 0,1 4,4H10L12,6H20M10.75,13H14V17H16V13H19.25L15,8.75" />
+</vector>

app/src/main/res/drawable/gift.xml

@@ -0,0 +1,8 @@
+<!-- drawable/gift.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#000" android:pathData="M22,12V20A2,2 0 0,1 20,22H4A2,2 0 0,1 2,20V12A1,1 0 0,1 1,11V8A2,2 0 0,1 3,6H6.17C6.06,5.69 6,5.35 6,5A3,3 0 0,1 9,2C10,2 10.88,2.5 11.43,3.24V3.23L12,4L12.57,3.23V3.24C13.12,2.5 14,2 15,2A3,3 0 0,1 18,5C18,5.35 17.94,5.69 17.83,6H21A2,2 0 0,1 23,8V11A1,1 0 0,1 22,12M4,20H11V12H4V20M20,20V12H13V20H20M9,4A1,1 0 0,0 8,5A1,1 0 0,0 9,6A1,1 0 0,0 10,5A1,1 0 0,0 9,4M15,4A1,1 0 0,0 14,5A1,1 0 0,0 15,6A1,1 0 0,0 16,5A1,1 0 0,0 15,4M3,8V10H11V8H3M13,8V10H21V8H13Z" />
+</vector>

app/src/main/res/drawable/healing.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M17.73,12.02l3.98,-3.98c0.39,-0.39 0.39,-1.02 0,-1.41l-4.34,-4.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-3.98,3.98L8,2.29C7.8,2.1 7.55,2 7.29,2c-0.25,0 -0.51,0.1 -0.7,0.29L2.25,6.63c-0.39,0.39 -0.39,1.02 0,1.41l3.98,3.98L2.25,16c-0.39,0.39 -0.39,1.02 0,1.41l4.34,4.34c0.39,0.39 1.02,0.39 1.41,0l3.98,-3.98 3.98,3.98c0.2,0.2 0.45,0.29 0.71,0.29 0.26,0 0.51,-0.1 0.71,-0.29l4.34,-4.34c0.39,-0.39 0.39,-1.02 0,-1.41l-3.99,-3.98zM12,9c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM7.29,10.96L3.66,7.34l3.63,-3.63 3.62,3.62 -3.62,3.63zM10,13c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM12,15c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM14,11c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM16.66,20.34l-3.63,-3.62 3.63,-3.63 3.62,3.62 -3.62,3.63z"/>
+</vector>

app/src/main/res/drawable/help_circle.xml

@@ -0,0 +1,8 @@
+<!-- drawable/help_circle.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#000" android:pathData="M15.07,11.25L14.17,12.17C13.45,12.89 13,13.5 13,15H11V14.5C11,13.39 11.45,12.39 12.17,11.67L13.41,10.41C13.78,10.05 14,9.55 14,9C14,7.89 13.1,7 12,7A2,2 0 0,0 10,9H8A4,4 0 0,1 12,5A4,4 0 0,1 16,9C16,9.88 15.64,10.67 15.07,11.25M13,19H11V17H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12C22,6.47 17.5,2 12,2Z" />
+</vector>

app/src/main/res/drawable/pencil.xml

@@ -0,0 +1,8 @@
+<!-- drawable/pencil.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#000" android:pathData="M20.71,7.04C21.1,6.65 21.1,6 20.71,5.63L18.37,3.29C18,2.9 17.35,2.9 16.96,3.29L15.12,5.12L18.87,8.87M3,17.25V21H6.75L17.81,9.93L14.06,6.18L3,17.25Z" />
+</vector>

app/src/main/res/drawable/plus_box.xml

@@ -0,0 +1,8 @@
+<!-- drawable/plus_box.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#000" android:pathData="M17,13H13V17H11V13H7V11H11V7H13V11H17M19,3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3Z" />
+</vector>

app/src/main/res/drawable/settings.xml

@@ -0,0 +1,8 @@
+<!-- drawable/settings.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#000" android:pathData="M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.65 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.03 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.67 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.03 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z" />
+</vector>

app/src/main/res/drawable/share_variant.xml

@@ -0,0 +1,8 @@
+<!-- drawable/share_variant.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#000" android:pathData="M18,16.08C17.24,16.08 16.56,16.38 16.04,16.85L8.91,12.7C8.96,12.47 9,12.24 9,12C9,11.76 8.96,11.53 8.91,11.3L15.96,7.19C16.5,7.69 17.21,8 18,8A3,3 0 0,0 21,5A3,3 0 0,0 18,2A3,3 0 0,0 15,5C15,5.24 15.04,5.47 15.09,5.7L8.04,9.81C7.5,9.31 6.79,9 6,9A3,3 0 0,0 3,12A3,3 0 0,0 6,15C6.79,15 7.5,14.69 8.04,14.19L15.16,18.34C15.11,18.55 15.08,18.77 15.08,19C15.08,20.61 16.39,21.91 18,21.91C19.61,21.91 20.92,20.61 20.92,19A2.92,2.92 0 0,0 18,16.08Z" />
+</vector>

app/src/main/res/drawable/thumb_up.xml

@@ -0,0 +1,8 @@
+<!-- drawable/thumb_up.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#000" android:pathData="M23,10C23,8.89 22.1,8 21,8H14.68L15.64,3.43C15.66,3.33 15.67,3.22 15.67,3.11C15.67,2.7 15.5,2.32 15.23,2.05L14.17,1L7.59,7.58C7.22,7.95 7,8.45 7,9V19A2,2 0 0,0 9,21H18C18.83,21 19.54,20.5 19.84,19.78L22.86,12.73C22.95,12.5 23,12.26 23,12V10.08L23,10M1,21H5V9H1V21Z" />
+</vector>

app/src/main/res/layout/activity_main.xml

@@ -36,7 +36,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
             android:layout_margin="@dimen/fab_margin"
-            android:src="@drawable/ic_save_white_24dp"/>
+            app:srcCompat="@drawable/content_save"/>
 
     </android.support.design.widget.CoordinatorLayout>
 

app/src/main/res/layout/create_patch_fragment.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_alignParentTop="true">
@@ -34,16 +35,26 @@
                     android:layout_marginTop="@dimen/card_line_margin"
                     android:background="@color/colorCardLine"/>
 
-                <TextView
-                    android:id="@+id/sourceFileNameTextView"
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:drawableLeft="@drawable/ic_folder_grey600_24dp"
-                    android:drawablePadding="8dp"
-                    android:padding="8dp"
-                    android:text="@string/main_activity_tap_to_select"
-                    android:textSize="20sp"/>
+                    android:layout_height="match_parent"
+                    android:orientation="horizontal">
 
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:padding="8dp"
+                        android:tint="@color/colorIcon"
+                        app:srcCompat="@drawable/folder"/>
+
+                    <TextView
+                        android:id="@+id/sourceFileNameTextView"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="8dp"
+                        android:text="@string/main_activity_tap_to_select"
+                        android:textSize="20sp"/>
+                </LinearLayout>
             </LinearLayout>
 
         </android.support.v7.widget.CardView>
@@ -74,16 +85,26 @@
                     android:layout_marginTop="@dimen/card_line_margin"
                     android:background="@color/colorCardLine"/>
 
-                <TextView
-                    android:id="@+id/modifiedFileNameTextView"
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:drawableLeft="@drawable/ic_folder_grey600_24dp"
-                    android:drawablePadding="8dp"
-                    android:padding="8dp"
-                    android:text="@string/main_activity_tap_to_select"
-                    android:textSize="20sp"/>
+                    android:layout_height="match_parent"
+                    android:orientation="horizontal">
 
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:padding="8dp"
+                        android:tint="@color/colorIcon"
+                        app:srcCompat="@drawable/folder"/>
+
+                    <TextView
+                        android:id="@+id/modifiedFileNameTextView"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="8dp"
+                        android:text="@string/main_activity_tap_to_select"
+                        android:textSize="20sp"/>
+                </LinearLayout>
             </LinearLayout>
 
         </android.support.v7.widget.CardView>
@@ -114,17 +135,27 @@
                     android:layout_marginTop="@dimen/card_line_margin"
                     android:background="@color/colorCardLine"/>
 
-                <TextView
-                    android:id="@+id/patchFileNameTextView"
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:drawableLeft="@drawable/ic_edit_grey600_24dp"
-                    android:drawablePadding="8dp"
-                    android:padding="8dp"
-                    android:text="@string/main_activity_tap_to_rename"
-                    android:textSize="20sp"/>
-            </LinearLayout>
+                    android:layout_height="match_parent"
+                    android:orientation="horizontal">
 
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:padding="8dp"
+                        android:tint="@color/colorIcon"
+                        app:srcCompat="@drawable/pencil"/>
+
+                    <TextView
+                        android:id="@+id/patchFileNameTextView"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="8dp"
+                        android:text="@string/main_activity_tap_to_rename"
+                        android:textSize="20sp"/>
+                </LinearLayout>
+            </LinearLayout>
         </android.support.v7.widget.CardView>
 
     </LinearLayout>

app/src/main/res/layout/file_picker_row_item.xml

@@ -17,6 +17,7 @@
             android:layout_marginBottom="8dp"
             android:layout_marginLeft="@dimen/keyline_one"
             android:layout_marginTop="8dp"
+            android:tint="@color/colorIcon"
             android:contentDescription="@string/icon">
         </ImageView>
 

app/src/main/res/layout/patching_fragment.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_alignParentTop="true">
@@ -34,16 +35,26 @@
                     android:layout_marginTop="@dimen/card_line_margin"
                     android:background="@color/colorCardLine"/>
 
-                <TextView
-                    android:id="@+id/patchNameTextView"
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:drawableLeft="@drawable/ic_folder_grey600_24dp"
-                    android:drawablePadding="8dp"
-                    android:padding="8dp"
-                    android:text="@string/main_activity_tap_to_select"
-                    android:textSize="20sp"/>
+                    android:layout_height="match_parent"
+                    android:orientation="horizontal">
 
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:padding="8dp"
+                        android:tint="@color/colorIcon"
+                        app:srcCompat="@drawable/folder"/>
+
+                    <TextView
+                        android:id="@+id/patchNameTextView"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="8dp"
+                        android:text="@string/main_activity_tap_to_select"
+                        android:textSize="20sp"/>
+                </LinearLayout>
             </LinearLayout>
 
         </android.support.v7.widget.CardView>
@@ -74,16 +85,26 @@
                     android:layout_marginTop="@dimen/card_line_margin"
                     android:background="@color/colorCardLine"/>
 
-                <TextView
-                    android:id="@+id/romNameTextView"
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:drawableLeft="@drawable/ic_folder_grey600_24dp"
-                    android:drawablePadding="8dp"
-                    android:padding="8dp"
-                    android:text="@string/main_activity_tap_to_select"
-                    android:textSize="20sp"/>
+                    android:layout_height="match_parent"
+                    android:orientation="horizontal">
 
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:padding="8dp"
+                        android:tint="@color/colorIcon"
+                        app:srcCompat="@drawable/folder"/>
+
+                    <TextView
+                        android:id="@+id/romNameTextView"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="8dp"
+                        android:text="@string/main_activity_tap_to_select"
+                        android:textSize="20sp"/>
+                </LinearLayout>
             </LinearLayout>
 
         </android.support.v7.widget.CardView>
@@ -114,15 +135,28 @@
                     android:layout_marginTop="@dimen/card_line_margin"
                     android:background="@color/colorCardLine"/>
 
-                <TextView
-                    android:id="@+id/outputNameTextView"
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:drawableLeft="@drawable/ic_edit_grey600_24dp"
-                    android:drawablePadding="8dp"
-                    android:padding="8dp"
-                    android:text="@string/main_activity_tap_to_rename"
-                    android:textSize="20sp"/>
+                    android:layout_height="match_parent"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:padding="8dp"
+                        android:tint="@color/colorIcon"
+                        app:srcCompat="@drawable/pencil"/>
+
+                    <TextView
+                        android:id="@+id/outputNameTextView"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="8dp"
+                        android:text="@string/main_activity_tap_to_rename"
+                        android:textSize="20sp"/>
+
+                </LinearLayout>
+
             </LinearLayout>
 
         </android.support.v7.widget.CardView>