diff --git a/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_black_18dp.png b/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_black_18dp.png
new file mode 100644
index 000000000..371d59c77
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_black_18dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_black_24dp.png b/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_black_24dp.png
new file mode 100644
index 000000000..b0cce494c
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_black_24dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_black_36dp.png b/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_black_36dp.png
new file mode 100644
index 000000000..5e7931b68
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_black_36dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_black_48dp.png b/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_black_48dp.png
new file mode 100644
index 000000000..4a818fc81
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_black_48dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_grey600_18dp.png b/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_grey600_18dp.png
new file mode 100644
index 000000000..a7cbb980c
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_grey600_18dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_grey600_24dp.png b/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_grey600_24dp.png
new file mode 100644
index 000000000..5e6f8b034
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_grey600_24dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_grey600_36dp.png b/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_grey600_36dp.png
new file mode 100644
index 000000000..59b10cdfb
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_grey600_36dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_grey600_48dp.png b/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_grey600_48dp.png
new file mode 100644
index 000000000..f5927e96c
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_grey600_48dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_white_18dp.png b/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_white_18dp.png
new file mode 100644
index 000000000..1eb851f55
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_white_18dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_white_24dp.png b/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_white_24dp.png
new file mode 100644
index 000000000..f4d4bea16
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_white_24dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_white_36dp.png b/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_white_36dp.png
new file mode 100644
index 000000000..ef37912f0
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_white_36dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_white_48dp.png b/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_white_48dp.png
new file mode 100644
index 000000000..6ac70632e
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-hdpi/ic_alphabetical_white_48dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_black_18dp.png b/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_black_18dp.png
new file mode 100644
index 000000000..0f81e256d
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_black_18dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_black_24dp.png b/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_black_24dp.png
new file mode 100644
index 000000000..59b1b3fef
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_black_24dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_black_36dp.png b/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_black_36dp.png
new file mode 100644
index 000000000..b0cce494c
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_black_36dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_black_48dp.png b/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_black_48dp.png
new file mode 100644
index 000000000..11028d171
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_black_48dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_grey600_18dp.png b/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_grey600_18dp.png
new file mode 100644
index 000000000..78cfbb61e
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_grey600_18dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_grey600_24dp.png b/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_grey600_24dp.png
new file mode 100644
index 000000000..176763607
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_grey600_24dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_grey600_36dp.png b/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_grey600_36dp.png
new file mode 100644
index 000000000..5e6f8b034
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_grey600_36dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_grey600_48dp.png b/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_grey600_48dp.png
new file mode 100644
index 000000000..394673622
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_grey600_48dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_white_18dp.png b/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_white_18dp.png
new file mode 100644
index 000000000..69a679110
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_white_18dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_white_24dp.png b/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_white_24dp.png
new file mode 100644
index 000000000..f89c322b8
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_white_24dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_white_36dp.png b/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_white_36dp.png
new file mode 100644
index 000000000..f4d4bea16
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_white_36dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_white_48dp.png b/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_white_48dp.png
new file mode 100644
index 000000000..84d98e812
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-mdpi/ic_alphabetical_white_48dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_black_18dp.png b/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_black_18dp.png
new file mode 100644
index 000000000..b0cce494c
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_black_18dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_black_24dp.png b/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_black_24dp.png
new file mode 100644
index 000000000..11028d171
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_black_24dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_black_36dp.png b/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_black_36dp.png
new file mode 100644
index 000000000..4a818fc81
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_black_36dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_black_48dp.png b/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_black_48dp.png
new file mode 100644
index 000000000..7345d0c50
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_black_48dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_grey600_18dp.png b/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_grey600_18dp.png
new file mode 100644
index 000000000..5e6f8b034
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_grey600_18dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_grey600_24dp.png b/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_grey600_24dp.png
new file mode 100644
index 000000000..394673622
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_grey600_24dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_grey600_36dp.png b/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_grey600_36dp.png
new file mode 100644
index 000000000..f5927e96c
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_grey600_36dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_grey600_48dp.png b/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_grey600_48dp.png
new file mode 100644
index 000000000..287af5984
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_grey600_48dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_white_18dp.png b/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_white_18dp.png
new file mode 100644
index 000000000..f4d4bea16
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_white_18dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_white_24dp.png b/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_white_24dp.png
new file mode 100644
index 000000000..84d98e812
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_white_24dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_white_36dp.png b/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_white_36dp.png
new file mode 100644
index 000000000..6ac70632e
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_white_36dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_white_48dp.png b/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_white_48dp.png
new file mode 100644
index 000000000..c1606c342
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xhdpi/ic_alphabetical_white_48dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_black_18dp.png b/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_black_18dp.png
new file mode 100644
index 000000000..5e7931b68
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_black_18dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_black_24dp.png b/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_black_24dp.png
new file mode 100644
index 000000000..4a818fc81
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_black_24dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_black_36dp.png b/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_black_36dp.png
new file mode 100644
index 000000000..53f6323fd
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_black_36dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_black_48dp.png b/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_black_48dp.png
new file mode 100644
index 000000000..0a948423a
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_black_48dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_grey600_18dp.png b/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_grey600_18dp.png
new file mode 100644
index 000000000..59b10cdfb
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_grey600_18dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_grey600_24dp.png b/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_grey600_24dp.png
new file mode 100644
index 000000000..f5927e96c
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_grey600_24dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_grey600_36dp.png b/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_grey600_36dp.png
new file mode 100644
index 000000000..fece969ec
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_grey600_36dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_grey600_48dp.png b/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_grey600_48dp.png
new file mode 100644
index 000000000..1aaa3c0d4
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_grey600_48dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_white_18dp.png b/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_white_18dp.png
new file mode 100644
index 000000000..ef37912f0
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_white_18dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_white_24dp.png b/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_white_24dp.png
new file mode 100644
index 000000000..6ac70632e
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_white_24dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_white_36dp.png b/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_white_36dp.png
new file mode 100644
index 000000000..bdf1409b0
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_white_36dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_white_48dp.png b/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_white_48dp.png
new file mode 100644
index 000000000..7d9dc1b9d
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xxhdpi/ic_alphabetical_white_48dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_black_18dp.png b/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_black_18dp.png
new file mode 100644
index 000000000..4a818fc81
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_black_18dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_black_24dp.png b/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_black_24dp.png
new file mode 100644
index 000000000..7345d0c50
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_black_24dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_black_36dp.png b/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_black_36dp.png
new file mode 100644
index 000000000..0a948423a
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_black_36dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_black_48dp.png b/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_black_48dp.png
new file mode 100644
index 000000000..0474c7193
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_black_48dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_grey600_18dp.png b/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_grey600_18dp.png
new file mode 100644
index 000000000..f5927e96c
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_grey600_18dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_grey600_24dp.png b/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_grey600_24dp.png
new file mode 100644
index 000000000..287af5984
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_grey600_24dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_grey600_36dp.png b/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_grey600_36dp.png
new file mode 100644
index 000000000..1aaa3c0d4
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_grey600_36dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_grey600_48dp.png b/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_grey600_48dp.png
new file mode 100644
index 000000000..719424739
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_grey600_48dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_white_18dp.png b/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_white_18dp.png
new file mode 100644
index 000000000..6ac70632e
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_white_18dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_white_24dp.png b/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_white_24dp.png
new file mode 100644
index 000000000..c1606c342
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_white_24dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_white_36dp.png b/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_white_36dp.png
new file mode 100644
index 000000000..7d9dc1b9d
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_white_36dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_white_48dp.png b/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_white_48dp.png
new file mode 100644
index 000000000..231f2829d
Binary files /dev/null and b/Graphics/drawables/originals/alphabetical/drawable-xxxhdpi/ic_alphabetical_white_48dp.png differ
diff --git a/Graphics/drawables/originals/alphabetical/drawable/alphabetical.xml b/Graphics/drawables/originals/alphabetical/drawable/alphabetical.xml
new file mode 100644
index 000000000..677190f7a
--- /dev/null
+++ b/Graphics/drawables/originals/alphabetical/drawable/alphabetical.xml
@@ -0,0 +1,8 @@
+<!-- drawable/alphabetical.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="M6,11A2,2 0 0,1 8,13V17H4A2,2 0 0,1 2,15V13A2,2 0 0,1 4,11H6M4,13V15H6V13H4M20,13V15H22V17H20A2,2 0 0,1 18,15V13A2,2 0 0,1 20,11H22V13H20M12,7V11H14A2,2 0 0,1 16,13V15A2,2 0 0,1 14,17H12A2,2 0 0,1 10,15V7H12M12,15H14V13H12V15Z" />
+</vector>
\ No newline at end of file
diff --git a/Graphics/drawables/originals/alphabetical/readme.txt b/Graphics/drawables/originals/alphabetical/readme.txt
new file mode 100644
index 000000000..cdab9130e
--- /dev/null
+++ b/Graphics/drawables/originals/alphabetical/readme.txt
@@ -0,0 +1,5 @@
+Thanks for visiting MaterialDesignIcons.com
+Check back often for new icons and follow @MaterialIcons for updates.
+
+Icon: alphabetical
+By: Austin Andrews
\ No newline at end of file
diff --git a/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_black_18dp.png b/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_black_18dp.png
new file mode 100644
index 000000000..791c29f06
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_black_18dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_black_24dp.png b/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_black_24dp.png
new file mode 100644
index 000000000..340734222
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_black_24dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_black_36dp.png b/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_black_36dp.png
new file mode 100644
index 000000000..e0215b416
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_black_36dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_black_48dp.png b/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_black_48dp.png
new file mode 100644
index 000000000..9b3a5ee4e
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_black_48dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_grey600_18dp.png b/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_grey600_18dp.png
new file mode 100644
index 000000000..e7e73e21a
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_grey600_18dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_grey600_24dp.png b/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_grey600_24dp.png
new file mode 100644
index 000000000..aca839f83
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_grey600_24dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_grey600_36dp.png b/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_grey600_36dp.png
new file mode 100644
index 000000000..ac8fc136a
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_grey600_36dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_grey600_48dp.png b/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_grey600_48dp.png
new file mode 100644
index 000000000..2473213ce
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_grey600_48dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_white_18dp.png b/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_white_18dp.png
new file mode 100644
index 000000000..e4749886e
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_white_18dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_white_24dp.png b/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_white_24dp.png
new file mode 100644
index 000000000..e2e829bf7
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_white_24dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_white_36dp.png b/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_white_36dp.png
new file mode 100644
index 000000000..bcf994623
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_white_36dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_white_48dp.png b/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_white_48dp.png
new file mode 100644
index 000000000..7ef38b8f2
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-hdpi/ic_numeric_white_48dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_black_18dp.png b/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_black_18dp.png
new file mode 100644
index 000000000..6e3347524
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_black_18dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_black_24dp.png b/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_black_24dp.png
new file mode 100644
index 000000000..3cec30130
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_black_24dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_black_36dp.png b/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_black_36dp.png
new file mode 100644
index 000000000..340734222
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_black_36dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_black_48dp.png b/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_black_48dp.png
new file mode 100644
index 000000000..b0936bb26
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_black_48dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_grey600_18dp.png b/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_grey600_18dp.png
new file mode 100644
index 000000000..3459da18f
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_grey600_18dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_grey600_24dp.png b/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_grey600_24dp.png
new file mode 100644
index 000000000..d2e6147a4
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_grey600_24dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_grey600_36dp.png b/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_grey600_36dp.png
new file mode 100644
index 000000000..aca839f83
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_grey600_36dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_grey600_48dp.png b/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_grey600_48dp.png
new file mode 100644
index 000000000..e06605985
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_grey600_48dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_white_18dp.png b/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_white_18dp.png
new file mode 100644
index 000000000..e96fe68a0
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_white_18dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_white_24dp.png b/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_white_24dp.png
new file mode 100644
index 000000000..cb5bb004c
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_white_24dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_white_36dp.png b/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_white_36dp.png
new file mode 100644
index 000000000..e2e829bf7
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_white_36dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_white_48dp.png b/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_white_48dp.png
new file mode 100644
index 000000000..af1618e95
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-mdpi/ic_numeric_white_48dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_black_18dp.png b/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_black_18dp.png
new file mode 100644
index 000000000..340734222
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_black_18dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_black_24dp.png b/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_black_24dp.png
new file mode 100644
index 000000000..b0936bb26
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_black_24dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_black_36dp.png b/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_black_36dp.png
new file mode 100644
index 000000000..9b3a5ee4e
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_black_36dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_black_48dp.png b/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_black_48dp.png
new file mode 100644
index 000000000..896791b45
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_black_48dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_grey600_18dp.png b/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_grey600_18dp.png
new file mode 100644
index 000000000..aca839f83
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_grey600_18dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_grey600_24dp.png b/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_grey600_24dp.png
new file mode 100644
index 000000000..e06605985
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_grey600_24dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_grey600_36dp.png b/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_grey600_36dp.png
new file mode 100644
index 000000000..2473213ce
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_grey600_36dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_grey600_48dp.png b/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_grey600_48dp.png
new file mode 100644
index 000000000..100958dea
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_grey600_48dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_white_18dp.png b/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_white_18dp.png
new file mode 100644
index 000000000..e2e829bf7
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_white_18dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_white_24dp.png b/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_white_24dp.png
new file mode 100644
index 000000000..af1618e95
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_white_24dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_white_36dp.png b/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_white_36dp.png
new file mode 100644
index 000000000..7ef38b8f2
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_white_36dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_white_48dp.png b/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_white_48dp.png
new file mode 100644
index 000000000..d02cdfec0
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xhdpi/ic_numeric_white_48dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_black_18dp.png b/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_black_18dp.png
new file mode 100644
index 000000000..e0215b416
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_black_18dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_black_24dp.png b/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_black_24dp.png
new file mode 100644
index 000000000..9b3a5ee4e
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_black_24dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_black_36dp.png b/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_black_36dp.png
new file mode 100644
index 000000000..4f6e2f27e
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_black_36dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_black_48dp.png b/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_black_48dp.png
new file mode 100644
index 000000000..e884b37a4
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_black_48dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_grey600_18dp.png b/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_grey600_18dp.png
new file mode 100644
index 000000000..ac8fc136a
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_grey600_18dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_grey600_24dp.png b/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_grey600_24dp.png
new file mode 100644
index 000000000..2473213ce
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_grey600_24dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_grey600_36dp.png b/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_grey600_36dp.png
new file mode 100644
index 000000000..4b12684c3
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_grey600_36dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_grey600_48dp.png b/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_grey600_48dp.png
new file mode 100644
index 000000000..fc17d69d9
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_grey600_48dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_white_18dp.png b/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_white_18dp.png
new file mode 100644
index 000000000..bcf994623
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_white_18dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_white_24dp.png b/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_white_24dp.png
new file mode 100644
index 000000000..7ef38b8f2
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_white_24dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_white_36dp.png b/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_white_36dp.png
new file mode 100644
index 000000000..4bd1cfb30
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_white_36dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_white_48dp.png b/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_white_48dp.png
new file mode 100644
index 000000000..2326bfd9b
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xxhdpi/ic_numeric_white_48dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_black_18dp.png b/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_black_18dp.png
new file mode 100644
index 000000000..9b3a5ee4e
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_black_18dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_black_24dp.png b/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_black_24dp.png
new file mode 100644
index 000000000..896791b45
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_black_24dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_black_36dp.png b/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_black_36dp.png
new file mode 100644
index 000000000..e884b37a4
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_black_36dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_black_48dp.png b/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_black_48dp.png
new file mode 100644
index 000000000..a82affc67
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_black_48dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_grey600_18dp.png b/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_grey600_18dp.png
new file mode 100644
index 000000000..2473213ce
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_grey600_18dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_grey600_24dp.png b/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_grey600_24dp.png
new file mode 100644
index 000000000..100958dea
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_grey600_24dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_grey600_36dp.png b/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_grey600_36dp.png
new file mode 100644
index 000000000..fc17d69d9
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_grey600_36dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_grey600_48dp.png b/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_grey600_48dp.png
new file mode 100644
index 000000000..3f26b2ad2
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_grey600_48dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_white_18dp.png b/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_white_18dp.png
new file mode 100644
index 000000000..7ef38b8f2
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_white_18dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_white_24dp.png b/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_white_24dp.png
new file mode 100644
index 000000000..d02cdfec0
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_white_24dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_white_36dp.png b/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_white_36dp.png
new file mode 100644
index 000000000..2326bfd9b
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_white_36dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_white_48dp.png b/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_white_48dp.png
new file mode 100644
index 000000000..2e3d38253
Binary files /dev/null and b/Graphics/drawables/originals/numeric/drawable-xxxhdpi/ic_numeric_white_48dp.png differ
diff --git a/Graphics/drawables/originals/numeric/drawable/numeric.xml b/Graphics/drawables/originals/numeric/drawable/numeric.xml
new file mode 100644
index 000000000..c9d9c6f10
--- /dev/null
+++ b/Graphics/drawables/originals/numeric/drawable/numeric.xml
@@ -0,0 +1,8 @@
+<!-- drawable/numeric.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="M4,17V9H2V7H6V17H4M22,15C22,16.11 21.1,17 20,17H16V15H20V13H18V11H20V9H16V7H20A2,2 0 0,1 22,9V10.5A1.5,1.5 0 0,1 20.5,12A1.5,1.5 0 0,1 22,13.5V15M14,15V17H8V13C8,11.89 8.9,11 10,11H12V9H8V7H12A2,2 0 0,1 14,9V11C14,12.11 13.1,13 12,13H10V15H14Z" />
+</vector>
\ No newline at end of file
diff --git a/Graphics/drawables/originals/numeric/readme.txt b/Graphics/drawables/originals/numeric/readme.txt
new file mode 100644
index 000000000..ddeb8a236
--- /dev/null
+++ b/Graphics/drawables/originals/numeric/readme.txt
@@ -0,0 +1,5 @@
+Thanks for visiting MaterialDesignIcons.com
+Check back often for new icons and follow @MaterialIcons for updates.
+
+Icon: numeric
+By: Austin Andrews
\ No newline at end of file
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
index 5f4303b32..b010893e2 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
@@ -31,6 +31,7 @@ import android.support.v4.app.FragmentActivity;
 import android.support.v7.app.AlertDialog;
 import android.text.Editable;
 import android.text.InputType;
+import android.text.Layout;
 import android.text.TextWatcher;
 import android.text.method.PasswordTransformationMethod;
 import android.view.ContextThemeWrapper;
@@ -42,6 +43,7 @@ import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ImageButton;
 import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.ViewAnimator;
@@ -286,12 +288,46 @@ public class PassphraseDialogActivity extends FragmentActivity {
             mPassphraseEditText.setImeActionLabel(getString(android.R.string.ok), EditorInfo.IME_ACTION_DONE);
             mPassphraseEditText.setOnEditorActionListener(this);
 
-            if ((keyType == CanonicalizedSecretKey.SecretKeyType.DIVERT_TO_CARD && Preferences.getPreferences(activity).useNumKeypadForSecurityTokenPin())
-                    || keyType == CanonicalizedSecretKey.SecretKeyType.PIN) {
+            final ImageButton keyboard = (ImageButton) mLayout.findViewById(R.id.passphrase_keyboard);
+
+            if (keyType == CanonicalizedSecretKey.SecretKeyType.PIN) {
                 mPassphraseEditText.setInputType(InputType.TYPE_CLASS_NUMBER);
-                mPassphraseEditText.setTransformationMethod(PasswordTransformationMethod.getInstance());
+                keyboard.setVisibility(View.GONE);
+            } else if (keyType == CanonicalizedSecretKey.SecretKeyType.DIVERT_TO_CARD) {
+                if (Preferences.getPreferences(activity).useNumKeypadForSecurityTokenPin()) {
+                    mPassphraseEditText.setInputType(InputType.TYPE_CLASS_NUMBER);
+                    keyboard.setImageResource(R.drawable.ic_alphabetical_black_24dp);
+                    keyboard.setContentDescription(getString(R.string.passphrase_keyboard_hint_alpha));
+                } else {
+                    mPassphraseEditText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+                    keyboard.setImageResource(R.drawable.ic_numeric_black_24dp);
+                    keyboard.setContentDescription(getString(R.string.passphrase_keyboard_hint_numeric));
+                }
+
+                keyboard.setVisibility(View.VISIBLE);
+                keyboard.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        Preferences prefs = Preferences.getPreferences(activity);
+                        if (prefs.useNumKeypadForSecurityTokenPin()) {
+                            prefs.setUseNumKeypadForSecurityTokenPin(false);
+
+                            mPassphraseEditText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+                            keyboard.setImageResource(R.drawable.ic_numeric_black_24dp);
+                            keyboard.setContentDescription(getString(R.string.passphrase_keyboard_hint_alpha));
+                        } else {
+                            prefs.setUseNumKeypadForSecurityTokenPin(true);
+
+                            mPassphraseEditText.setInputType(InputType.TYPE_CLASS_NUMBER);
+                            keyboard.setImageResource(R.drawable.ic_alphabetical_black_24dp);
+                            keyboard.setContentDescription(getString(R.string.passphrase_keyboard_hint_numeric));
+                        }
+                    }
+                });
+
             } else {
-                mPassphraseEditText.setRawInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+                mPassphraseEditText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+                keyboard.setVisibility(View.GONE);
             }
 
             mPassphraseEditText.setTransformationMethod(PasswordTransformationMethod.getInstance());
@@ -359,7 +395,6 @@ public class PassphraseDialogActivity extends FragmentActivity {
             }
         }
 
-
         @Override
         public void onStart() {
             super.onStart();
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
index 7ca2875ea..6a6d8d18a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
@@ -206,6 +206,12 @@ public class Preferences {
         editor.commit();
     }
 
+    public void setUseNumKeypadForSecurityTokenPin(boolean useNumKeypad) {
+        SharedPreferences.Editor editor = mSharedPreferences.edit();
+        editor.putBoolean(Pref.USE_NUMKEYPAD_FOR_SECURITY_TOKEN_PIN, useNumKeypad);
+        editor.commit();
+    }
+
     public boolean getUseArmor() {
         return mSharedPreferences.getBoolean(Pref.USE_ARMOR, false);
     }
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_alphabetical_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_alphabetical_black_24dp.png
new file mode 100644
index 000000000..b0cce494c
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_alphabetical_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_numeric_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_numeric_black_24dp.png
new file mode 100644
index 000000000..340734222
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_numeric_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_alphabetical_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_alphabetical_black_24dp.png
new file mode 100644
index 000000000..59b1b3fef
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_alphabetical_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_numeric_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_numeric_black_24dp.png
new file mode 100644
index 000000000..3cec30130
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_numeric_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_alphabetical_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_alphabetical_black_24dp.png
new file mode 100644
index 000000000..11028d171
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_alphabetical_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_numeric_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_numeric_black_24dp.png
new file mode 100644
index 000000000..b0936bb26
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_numeric_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_alphabetical_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_alphabetical_black_24dp.png
new file mode 100644
index 000000000..4a818fc81
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_alphabetical_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_numeric_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_numeric_black_24dp.png
new file mode 100644
index 000000000..9b3a5ee4e
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_numeric_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_alphabetical_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_alphabetical_black_24dp.png
new file mode 100644
index 000000000..7345d0c50
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_alphabetical_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_numeric_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_numeric_black_24dp.png
new file mode 100644
index 000000000..896791b45
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_numeric_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
index 7252effad..171ad46f9 100644
--- a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
@@ -23,15 +23,32 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:text="@string/enter_passphrase" />
 
-        <EditText
-            android:id="@+id/passphrase_passphrase"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:imeOptions="actionDone"
-            android:hint="@string/label_passphrase"
-            android:ems="10"
-            android:layout_gravity="center_horizontal" />
+            android:orientation="horizontal">
+
+            <EditText
+                android:id="@+id/passphrase_passphrase"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:imeOptions="actionDone"
+                android:hint="@string/label_passphrase"
+                android:ems="10"
+                android:layout_weight="1"
+                android:layout_gravity="center_horizontal" />
+
+            <ImageButton
+                android:id="@+id/passphrase_keyboard"
+                android:src="@drawable/ic_numeric_black_24dp"
+                style="@style/MaterialFlatButton"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:layout_gravity="center_vertical" />
+
+        </LinearLayout>
+
 
         <LinearLayout
             android:layout_width="wrap_content"
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 746e13061..878362486 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -152,7 +152,6 @@
     <string name="label_file_ascii_armor">"Enable ASCII Armor"</string>
     <string name="label_write_version_header">"Let others know that you're using OpenKeychain"</string>
     <string name="label_write_version_header_summary">"Writes 'OpenKeychain v2.7' to OpenPGP signatures, ciphertext, and exported keys"</string>
-    <string name="label_use_num_keypad_for_security_token_pin">Use number keypad for PINs</string>
     <string name="label_asymmetric_from">"Sign with:"</string>
     <string name="label_to">"Encrypt to"</string>
     <string name="label_delete_after_encryption">"Delete files after encryption"</string>
@@ -314,6 +313,8 @@
     <string name="passphrase_for_symmetric_encryption">"Enter password"</string>
     <string name="passphrase_for_backup">"Enter backup code"</string>
     <string name="passphrase_for">"Enter password for '%s'"</string>
+    <string name="passphrase_keyboard_hint_alpha">"Change to alphabetic keyboard"</string>
+    <string name="passphrase_keyboard_hint_numeric">"Change to numeric keyboard"</string>
     <string name="pin_for">"Enter PIN for '%s'"</string>
     <string name="security_token_pin_for">"Enter PIN to access Security Token for '%s'"</string>
     <string name="security_token_nfc_text">"Hold Security Token against the NFC marker at the back of your device."</string>
diff --git a/OpenKeychain/src/main/res/xml/passphrase_preferences.xml b/OpenKeychain/src/main/res/xml/passphrase_preferences.xml
index b9696492a..0d9db1d51 100644
--- a/OpenKeychain/src/main/res/xml/passphrase_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/passphrase_preferences.xml
@@ -7,8 +7,4 @@
         android:defaultValue="false"
         android:key="passphraseCacheSubs"
         android:title="@string/label_passphrase_cache_subs" />
-    <SwitchPreference
-        android:defaultValue="true"
-        android:key="useNumKeypadForYubikeyPin"
-        android:title="@string/label_use_num_keypad_for_security_token_pin" />
 </PreferenceScreen>