diff --git a/res/drawable/fod_icon_cpt_america_flat.webp b/res/drawable/fod_icon_cpt_america_flat.webp
deleted file mode 100644
index 54d0a8b..0000000
Binary files a/res/drawable/fod_icon_cpt_america_flat.webp and /dev/null differ
diff --git a/res/drawable/fod_icon_cpt_america_flat_gray.webp b/res/drawable/fod_icon_cpt_america_flat_gray.webp
deleted file mode 100644
index 645a28b..0000000
Binary files a/res/drawable/fod_icon_cpt_america_flat_gray.webp and /dev/null differ
diff --git a/res/drawable/fod_icon_default_5.webp b/res/drawable/fod_icon_default_5.webp
deleted file mode 100644
index b335917..0000000
Binary files a/res/drawable/fod_icon_default_5.webp and /dev/null differ
diff --git a/res/drawable/fod_icon_dragon_black_flat.webp b/res/drawable/fod_icon_dragon_black_flat.webp
deleted file mode 100644
index 214db1c..0000000
Binary files a/res/drawable/fod_icon_dragon_black_flat.webp and /dev/null differ
diff --git a/res/drawable/fod_icon_fire_ice_ouroboros.webp b/res/drawable/fod_icon_fire_ice_ouroboros.webp
deleted file mode 100644
index 62dc1ac..0000000
Binary files a/res/drawable/fod_icon_fire_ice_ouroboros.webp and /dev/null differ
diff --git a/res/drawable/fod_icon_op_white.png b/res/drawable/fod_icon_op_white.png
new file mode 100755
index 0000000..c30ee36
Binary files /dev/null and b/res/drawable/fod_icon_op_white.png differ
diff --git a/res/drawable/fod_icon_paint_splash_circle.webp b/res/drawable/fod_icon_paint_splash_circle.webp
deleted file mode 100644
index f2a76c5..0000000
Binary files a/res/drawable/fod_icon_paint_splash_circle.webp and /dev/null differ
diff --git a/res/drawable/fod_icon_rainbow_horn.webp b/res/drawable/fod_icon_rainbow_horn.webp
deleted file mode 100644
index cc64927..0000000
Binary files a/res/drawable/fod_icon_rainbow_horn.webp and /dev/null differ
diff --git a/res/drawable/fod_icon_sammy.png b/res/drawable/fod_icon_sammy.png
new file mode 100755
index 0000000..80d7329
Binary files /dev/null and b/res/drawable/fod_icon_sammy.png differ
diff --git a/res/drawable/fod_icon_scratch_pink_blue.webp b/res/drawable/fod_icon_scratch_pink_blue.webp
deleted file mode 100644
index a6e1906..0000000
Binary files a/res/drawable/fod_icon_scratch_pink_blue.webp and /dev/null differ
diff --git a/res/drawable/fod_icon_scratch_red_blue.webp b/res/drawable/fod_icon_scratch_red_blue.webp
deleted file mode 100644
index d7dfef0..0000000
Binary files a/res/drawable/fod_icon_scratch_red_blue.webp and /dev/null differ
diff --git a/res/drawable/fod_icon_shooky.webp b/res/drawable/fod_icon_shooky.webp
deleted file mode 100644
index f1ac32b..0000000
Binary files a/res/drawable/fod_icon_shooky.webp and /dev/null differ
diff --git a/res/drawable/fod_icon_spiral_blue.webp b/res/drawable/fod_icon_spiral_blue.webp
deleted file mode 100644
index 3d69c31..0000000
Binary files a/res/drawable/fod_icon_spiral_blue.webp and /dev/null differ
diff --git a/res/drawable/fod_icon_unfunnyguy.png b/res/drawable/fod_icon_unfunnyguy.png
new file mode 100755
index 0000000..8da7665
Binary files /dev/null and b/res/drawable/fod_icon_unfunnyguy.png differ
diff --git a/res/drawable/fod_icon_zaid1.webp b/res/drawable/fod_icon_zaid1.webp
new file mode 100755
index 0000000..8ef1235
Binary files /dev/null and b/res/drawable/fod_icon_zaid1.webp differ
diff --git a/res/drawable/fod_icon_zaid2.webp b/res/drawable/fod_icon_zaid2.webp
new file mode 100755
index 0000000..ac553c2
Binary files /dev/null and b/res/drawable/fod_icon_zaid2.webp differ
diff --git a/res/drawable/fod_icon_zaid3.webp b/res/drawable/fod_icon_zaid3.webp
new file mode 100755
index 0000000..d35c8d1
Binary files /dev/null and b/res/drawable/fod_icon_zaid3.webp differ
diff --git a/res/drawable/fod_icon_zaid4.webp b/res/drawable/fod_icon_zaid4.webp
new file mode 100755
index 0000000..382df5e
Binary files /dev/null and b/res/drawable/fod_icon_zaid4.webp differ
diff --git a/res/drawable/fod_icon_zaid5.webp b/res/drawable/fod_icon_zaid5.webp
new file mode 100755
index 0000000..ba8ccc7
Binary files /dev/null and b/res/drawable/fod_icon_zaid5.webp differ
diff --git a/res/drawable/fod_icon_zaid6.webp b/res/drawable/fod_icon_zaid6.webp
new file mode 100755
index 0000000..eed6f00
Binary files /dev/null and b/res/drawable/fod_icon_zaid6.webp differ
diff --git a/res/layout/fod_picker_preference.xml b/res/layout/fod_picker_preference.xml
index ebb8916..a220d13 100644
--- a/res/layout/fod_picker_preference.xml
+++ b/res/layout/fod_picker_preference.xml
@@ -106,7 +106,7 @@
             android:id="@+id/fodicon6_button"
             android:layout_width="@dimen/fod_picker_item_size"
             android:layout_height="@dimen/fod_picker_item_size"
-            android:src="@drawable/fod_icon_default_5"
+            android:src="@drawable/fod_icon_madness"
             android:scaleType="centerInside"
             android:padding="@dimen/fod_picker_item_padding"
             android:layout_margin="@dimen/fod_picker_item_margin"
@@ -126,7 +126,7 @@
             android:id="@+id/fodicon8_button"
             android:layout_width="@dimen/fod_picker_item_size"
             android:layout_height="@dimen/fod_picker_item_size"
-            android:src="@drawable/fod_icon_cpt_america_flat"
+            android:src="@drawable/fod_icon_octavi"
             android:scaleType="centerInside"
             android:padding="@dimen/fod_picker_item_padding"
             android:layout_margin="@dimen/fod_picker_item_margin"
@@ -144,7 +144,7 @@
             android:id="@+id/fodicon9_button"
             android:layout_width="@dimen/fod_picker_item_size"
             android:layout_height="@dimen/fod_picker_item_size"
-            android:src="@drawable/fod_icon_cpt_america_flat_gray"
+            android:src="@drawable/fod_icon_zaid1"
             android:scaleType="centerInside"
             android:padding="@dimen/fod_picker_item_padding"
             android:layout_margin="@dimen/fod_picker_item_margin"
@@ -154,7 +154,7 @@
             android:id="@+id/fodicon10_button"
             android:layout_width="@dimen/fod_picker_item_size"
             android:layout_height="@dimen/fod_picker_item_size"
-            android:src="@drawable/fod_icon_dragon_black_flat"
+            android:src="@drawable/fod_icon_zaid2"
             android:scaleType="centerInside"
             android:padding="@dimen/fod_picker_item_padding"
             android:layout_margin="@dimen/fod_picker_item_margin"
@@ -164,7 +164,7 @@
             android:id="@+id/fodicon11_button"
             android:layout_width="@dimen/fod_picker_item_size"
             android:layout_height="@dimen/fod_picker_item_size"
-            android:src="@drawable/fod_icon_octavi"
+            android:src="@drawable/fod_icon_zaid3"
             android:scaleType="centerInside"
             android:padding="@dimen/fod_picker_item_padding"
             android:layout_margin="@dimen/fod_picker_item_margin"
@@ -240,7 +240,7 @@
             android:id="@+id/fodicon17_button"
             android:layout_width="@dimen/fod_picker_item_size"
             android:layout_height="@dimen/fod_picker_item_size"
-            android:src="@drawable/fod_icon_paint_splash_circle"
+            android:src="@drawable/fod_icon_whatever"
             android:scaleType="centerInside"
             android:padding="@dimen/fod_picker_item_padding"
             android:layout_margin="@dimen/fod_picker_item_margin"
@@ -258,7 +258,7 @@
             android:id="@+id/fodicon18_button"
             android:layout_width="@dimen/fod_picker_item_size"
             android:layout_height="@dimen/fod_picker_item_size"
-            android:src="@drawable/fod_icon_rainbow_horn"
+            android:src="@drawable/fod_icon_unfunnyguy"
             android:scaleType="centerInside"
             android:padding="@dimen/fod_picker_item_padding"
             android:layout_margin="@dimen/fod_picker_item_margin"
@@ -268,7 +268,7 @@
             android:id="@+id/fodicon19_button"
             android:layout_width="@dimen/fod_picker_item_size"
             android:layout_height="@dimen/fod_picker_item_size"
-            android:src="@drawable/fod_icon_shooky"
+            android:src="@drawable/fod_icon_zaid4"
             android:scaleType="centerInside"
             android:padding="@dimen/fod_picker_item_padding"
             android:layout_margin="@dimen/fod_picker_item_margin"
@@ -278,7 +278,7 @@
             android:id="@+id/fodicon20_button"
             android:layout_width="@dimen/fod_picker_item_size"
             android:layout_height="@dimen/fod_picker_item_size"
-            android:src="@drawable/fod_icon_spiral_blue"
+            android:src="@drawable/fod_icon_zaid5"
             android:scaleType="centerInside"
             android:padding="@dimen/fod_picker_item_padding"
             android:layout_margin="@dimen/fod_picker_item_margin"
@@ -306,7 +306,7 @@
             android:id="@+id/fodicon22_button"
             android:layout_width="@dimen/fod_picker_item_size"
             android:layout_height="@dimen/fod_picker_item_size"
-            android:src="@drawable/fod_icon_scratch_pink_blue"
+            android:src="@drawable/fod_icon_sammy"
             android:scaleType="centerInside"
             android:padding="@dimen/fod_picker_item_padding"
             android:layout_margin="@dimen/fod_picker_item_margin"
@@ -316,7 +316,7 @@
             android:id="@+id/fodicon23_button"
             android:layout_width="@dimen/fod_picker_item_size"
             android:layout_height="@dimen/fod_picker_item_size"
-            android:src="@drawable/fod_icon_scratch_red_blue"
+            android:src="@drawable/fod_icon_op_white"
             android:scaleType="centerInside"
             android:padding="@dimen/fod_picker_item_padding"
             android:layout_margin="@dimen/fod_picker_item_margin"
@@ -334,7 +334,7 @@
             android:id="@+id/fodicon24_button"
             android:layout_width="@dimen/fod_picker_item_size"
             android:layout_height="@dimen/fod_picker_item_size"
-            android:src="@drawable/fod_icon_fire_ice_ouroboros"
+            android:src="@drawable/fod_icon_zaid6"
             android:scaleType="centerInside"
             android:padding="@dimen/fod_picker_item_padding"
             android:layout_margin="@dimen/fod_picker_item_margin"