diff --git a/Clover/app/src/main/java/org/floens/chan/ui/adapter/PinAdapter.java b/Clover/app/src/main/java/org/floens/chan/ui/adapter/PinAdapter.java
index aedb532a..e5ed1a5f 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/adapter/PinAdapter.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/adapter/PinAdapter.java
@@ -37,6 +37,7 @@ import org.floens.chan.utils.AndroidUtils;
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.floens.chan.ui.theme.ThemeHelper.theme;
 import static org.floens.chan.utils.AndroidUtils.ROBOTO_MEDIUM;
 import static org.floens.chan.utils.AndroidUtils.dp;
 import static org.floens.chan.utils.AndroidUtils.getAttrColor;
@@ -80,7 +81,7 @@ public class PinAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> im
             case TYPE_HEADER:
                 HeaderHolder headerHolder = (HeaderHolder) holder;
                 headerHolder.text.setText(R.string.drawer_pinned);
-                headerHolder.image.setImageResource(R.drawable.ic_settings_grey600_24dp);
+                theme().settingsDrawable.apply(headerHolder.image);
 
                 break;
             case TYPE_PIN:
@@ -94,7 +95,7 @@ public class PinAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> im
                 switch (position) {
                     case 1:
                         linkHolder.text.setText(R.string.settings_screen);
-                        linkHolder.image.setImageResource(R.drawable.ic_settings_grey600_24dp);
+                        theme().settingsDrawable.apply(linkHolder.image);
                         break;
                 }
                 break;
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/PostRepliesController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/PostRepliesController.java
index ac6a54b6..ca430d06 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/controller/PostRepliesController.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/PostRepliesController.java
@@ -21,6 +21,7 @@ import android.animation.ValueAnimator;
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Color;
+import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -42,7 +43,8 @@ import org.floens.chan.ui.cell.PostCell;
 import org.floens.chan.ui.helper.PostPopupHelper;
 import org.floens.chan.ui.view.LoadView;
 import org.floens.chan.ui.view.ThumbnailView;
-import org.floens.chan.ui.theme.ThemeHelper;
+
+import static org.floens.chan.ui.theme.ThemeHelper.theme;
 
 public class PostRepliesController extends Controller {
     private static final int TRANSITION_DURATION = 200;
@@ -148,9 +150,19 @@ public class PostRepliesController extends Controller {
             }
         });
 
-        if (!ThemeHelper.getInstance().getTheme().isLightTheme) {
-            ((TextView) dataView.findViewById(R.id.replies_back_icon)).setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_arrow_back_white_24dp, 0, 0, 0);
-            ((TextView) dataView.findViewById(R.id.replies_close_icon)).setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_done_white_24dp, 0, 0, 0);
+        Drawable backDrawable = theme().backDrawable.makeDrawable(context);
+        Drawable doneDrawable = theme().doneDrawable.makeDrawable(context);
+
+        TextView repliesBackText = ((TextView) dataView.findViewById(R.id.replies_back_icon));
+        TextView repliesCloseText = ((TextView) dataView.findViewById(R.id.replies_close_icon));
+        repliesBackText.setCompoundDrawablesWithIntrinsicBounds(backDrawable, null, null, null);
+        repliesCloseText.setCompoundDrawablesWithIntrinsicBounds(doneDrawable, null, null, null);
+        if (theme().isLightTheme) {
+            repliesBackText.setTextColor(0x8a000000);
+            repliesCloseText.setTextColor(0x8a000000);
+        } else {
+            repliesBackText.setTextColor(0xffffffff);
+            repliesCloseText.setTextColor(0xffffffff);
             dataView.findViewById(R.id.container).setBackgroundResource(R.drawable.dialog_full_dark);
         }
 
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/layout/ReplyLayout.java b/Clover/app/src/main/java/org/floens/chan/ui/layout/ReplyLayout.java
index 72114168..6e7d4e56 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/layout/ReplyLayout.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/layout/ReplyLayout.java
@@ -47,6 +47,7 @@ import org.floens.chan.ui.theme.ThemeHelper;
 
 import java.io.File;
 
+import static org.floens.chan.ui.theme.ThemeHelper.theme;
 import static org.floens.chan.utils.AndroidUtils.dp;
 import static org.floens.chan.utils.AndroidUtils.getAttrColor;
 import static org.floens.chan.utils.AndroidUtils.getString;
@@ -125,9 +126,11 @@ public class ReplyLayout extends LoadView implements View.OnClickListener, Anima
         setRoundItemBackground(more);
         more.setOnClickListener(this);
         attach = (ImageView) replyInputLayout.findViewById(R.id.attach);
+        theme().imageDrawable.apply(attach);
         setRoundItemBackground(attach);
         attach.setOnClickListener(this);
         submit = (ImageView) replyInputLayout.findViewById(R.id.submit);
+        theme().sendDrawable.apply(submit);
         setRoundItemBackground(submit);
         submit.setOnClickListener(this);
 
@@ -319,7 +322,12 @@ public class ReplyLayout extends LoadView implements View.OnClickListener, Anima
 
     @Override
     public void openPreview(boolean show, File previewFile) {
-        attach.setImageResource(show ? R.drawable.ic_close_grey600_24dp : R.drawable.ic_image_grey600_24dp);
+        if (show) {
+            theme().clearDrawable.apply(attach);
+        } else {
+            theme().imageDrawable.apply(attach);
+        }
+
         if (show) {
             ImageDecoder.decodeFileOnBackgroundThread(previewFile, dp(100), dp(100), this);
         } else {
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/theme/DarkTheme.java b/Clover/app/src/main/java/org/floens/chan/ui/theme/DarkTheme.java
new file mode 100644
index 00000000..78de8c86
--- /dev/null
+++ b/Clover/app/src/main/java/org/floens/chan/ui/theme/DarkTheme.java
@@ -0,0 +1,19 @@
+package org.floens.chan.ui.theme;
+
+import org.floens.chan.R;
+
+public class DarkTheme extends Theme {
+    public DarkTheme(String displayName, String name, int resValue, boolean isLightTheme, ThemeHelper.PrimaryColor primaryColor) {
+        super(displayName, name, resValue, isLightTheme, primaryColor);
+    }
+
+    public void resolveDrawables() {
+        super.resolveDrawables();
+        settingsDrawable = new ThemeDrawable(R.drawable.ic_settings_white_24dp, 1f);
+        imageDrawable = new ThemeDrawable(R.drawable.ic_image_white_24dp, 1f);
+        sendDrawable = new ThemeDrawable(R.drawable.ic_send_white_24dp, 1f);
+        clearDrawable = new ThemeDrawable(R.drawable.ic_clear_white_24dp, 1f);
+        backDrawable = new ThemeDrawable(R.drawable.ic_arrow_back_white_24dp, 1f);
+        doneDrawable = new ThemeDrawable(R.drawable.ic_done_white_24dp, 1f);
+    }
+}
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/theme/Theme.java b/Clover/app/src/main/java/org/floens/chan/ui/theme/Theme.java
index 8a728f97..9489f90b 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/theme/Theme.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/theme/Theme.java
@@ -17,8 +17,11 @@
  */
 package org.floens.chan.ui.theme;
 
+import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
+import android.widget.ImageView;
 
 import org.floens.chan.R;
 import org.floens.chan.utils.AndroidUtils;
@@ -46,6 +49,13 @@ public class Theme {
     public int idBackgroundDark;
     public int capcodeColor;
 
+    public ThemeDrawable settingsDrawable;
+    public ThemeDrawable imageDrawable;
+    public ThemeDrawable sendDrawable;
+    public ThemeDrawable clearDrawable;
+    public ThemeDrawable backDrawable;
+    public ThemeDrawable doneDrawable;
+
     public Theme(String displayName, String name, int resValue, boolean isLightTheme, ThemeHelper.PrimaryColor primaryColor) {
         this.displayName = displayName;
         this.name = name;
@@ -54,6 +64,16 @@ public class Theme {
         this.primaryColor = primaryColor;
 
         resolveSpanColors();
+        resolveDrawables();
+    }
+
+    public void resolveDrawables() {
+        settingsDrawable = new ThemeDrawable(R.drawable.ic_settings_black_24dp, 0.54f);
+        imageDrawable = new ThemeDrawable(R.drawable.ic_image_black_24dp, 0.54f);
+        sendDrawable = new ThemeDrawable(R.drawable.ic_send_black_24dp, 0.54f);
+        clearDrawable = new ThemeDrawable(R.drawable.ic_clear_black_24dp, 0.54f);
+        backDrawable = new ThemeDrawable(R.drawable.ic_arrow_back_black_24dp, 0.54f);
+        doneDrawable = new ThemeDrawable(R.drawable.ic_done_black_24dp, 0.54f);
     }
 
     private void resolveSpanColors() {
@@ -87,4 +107,30 @@ public class Theme {
 
         ta.recycle();
     }
+
+    public static class ThemeDrawable {
+        public int drawable;
+        public float alpha;
+        public int intAlpha;
+
+        public ThemeDrawable(int drawable, float alpha) {
+            this.drawable = drawable;
+            this.alpha = alpha;
+            intAlpha = Math.round(alpha * 0xff);
+        }
+
+        public void apply(ImageView imageView) {
+            imageView.setImageResource(drawable);
+            // Use the int one!
+            //noinspection deprecation
+            imageView.setAlpha(intAlpha);
+        }
+
+        public Drawable makeDrawable(Context context) {
+            //noinspection deprecation
+            Drawable d = context.getResources().getDrawable(drawable);
+            d.setAlpha(intAlpha);
+            return d;
+        }
+    }
 }
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/theme/ThemeHelper.java b/Clover/app/src/main/java/org/floens/chan/ui/theme/ThemeHelper.java
index b2bb23b5..a62e8f73 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/theme/ThemeHelper.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/theme/ThemeHelper.java
@@ -37,14 +37,18 @@ public class ThemeHelper {
         return instance;
     }
 
+    public static Theme theme() {
+        return getInstance().getTheme();
+    }
+
     private List<Theme> themes = new ArrayList<>();
 
     private Theme theme;
 
     public ThemeHelper() {
         themes.add(new Theme("Light", "light", R.style.Chan_Theme, true, PrimaryColor.GREEN));
-        themes.add(new Theme("Dark", "dark", R.style.Chan_Theme_Dark, false, PrimaryColor.DARK));
-        themes.add(new Theme("Black", "black", R.style.Chan_Theme_Black, false, PrimaryColor.BLACK));
+        themes.add(new DarkTheme("Dark", "dark", R.style.Chan_Theme_Dark, false, PrimaryColor.DARK));
+        themes.add(new DarkTheme("Black", "black", R.style.Chan_Theme_Black, false, PrimaryColor.BLACK));
         updateCurrentTheme();
     }
 
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/toolbar/Toolbar.java b/Clover/app/src/main/java/org/floens/chan/ui/toolbar/Toolbar.java
index c7999a76..f028b91f 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/toolbar/Toolbar.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/toolbar/Toolbar.java
@@ -327,7 +327,7 @@ public class Toolbar extends LinearLayout implements View.OnClickListener, LoadV
             searchViewParams.gravity = Gravity.CENTER_VERTICAL;
             searchViewWrapper.addView(searchView, searchViewParams);
 
-            clearButton.setImageResource(R.drawable.ic_close_white_24dp);
+            clearButton.setImageResource(R.drawable.ic_clear_white_24dp);
             clearButton.setAlpha(searchView.length() == 0 ? 0.6f : 1.0f);
             clearButton.setScaleType(ImageView.ScaleType.CENTER);
             clearButton.setOnClickListener(new OnClickListener() {
diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_clear_black_24dp.png b/Clover/app/src/main/res/drawable-hdpi/ic_clear_black_24dp.png
new file mode 100644
index 00000000..1a9cd75a
Binary files /dev/null and b/Clover/app/src/main/res/drawable-hdpi/ic_clear_black_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_clear_white_24dp.png b/Clover/app/src/main/res/drawable-hdpi/ic_clear_white_24dp.png
new file mode 100644
index 00000000..ceb1a1ee
Binary files /dev/null and b/Clover/app/src/main/res/drawable-hdpi/ic_clear_white_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_close_grey600_24dp.png b/Clover/app/src/main/res/drawable-hdpi/ic_close_grey600_24dp.png
deleted file mode 100644
index 32580318..00000000
Binary files a/Clover/app/src/main/res/drawable-hdpi/ic_close_grey600_24dp.png and /dev/null differ
diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png b/Clover/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png
deleted file mode 100644
index 0fd15563..00000000
Binary files a/Clover/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png and /dev/null differ
diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_image_black_24dp.png b/Clover/app/src/main/res/drawable-hdpi/ic_image_black_24dp.png
new file mode 100644
index 00000000..52c78874
Binary files /dev/null and b/Clover/app/src/main/res/drawable-hdpi/ic_image_black_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_image_grey600_24dp.png b/Clover/app/src/main/res/drawable-hdpi/ic_image_grey600_24dp.png
deleted file mode 100644
index c837fd89..00000000
Binary files a/Clover/app/src/main/res/drawable-hdpi/ic_image_grey600_24dp.png and /dev/null differ
diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_image_white_24dp.png b/Clover/app/src/main/res/drawable-hdpi/ic_image_white_24dp.png
new file mode 100644
index 00000000..b414cf5b
Binary files /dev/null and b/Clover/app/src/main/res/drawable-hdpi/ic_image_white_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_send_black_24dp.png b/Clover/app/src/main/res/drawable-hdpi/ic_send_black_24dp.png
new file mode 100644
index 00000000..7be098fd
Binary files /dev/null and b/Clover/app/src/main/res/drawable-hdpi/ic_send_black_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_send_grey600_24dp.png b/Clover/app/src/main/res/drawable-hdpi/ic_send_grey600_24dp.png
deleted file mode 100644
index b771392e..00000000
Binary files a/Clover/app/src/main/res/drawable-hdpi/ic_send_grey600_24dp.png and /dev/null differ
diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_send_white_24dp.png b/Clover/app/src/main/res/drawable-hdpi/ic_send_white_24dp.png
new file mode 100644
index 00000000..0f001720
Binary files /dev/null and b/Clover/app/src/main/res/drawable-hdpi/ic_send_white_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.png b/Clover/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.png
new file mode 100644
index 00000000..acf1ddf8
Binary files /dev/null and b/Clover/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png b/Clover/app/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index 20d2b66e..00000000
Binary files a/Clover/app/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png and /dev/null differ
diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_settings_white_24dp.png b/Clover/app/src/main/res/drawable-hdpi/ic_settings_white_24dp.png
new file mode 100644
index 00000000..97ded33b
Binary files /dev/null and b/Clover/app/src/main/res/drawable-hdpi/ic_settings_white_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_clear_black_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_clear_black_24dp.png
new file mode 100644
index 00000000..40a1a84e
Binary files /dev/null and b/Clover/app/src/main/res/drawable-mdpi/ic_clear_black_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_clear_white_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_clear_white_24dp.png
new file mode 100644
index 00000000..af7f8288
Binary files /dev/null and b/Clover/app/src/main/res/drawable-mdpi/ic_clear_white_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_close_grey600_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_close_grey600_24dp.png
deleted file mode 100644
index 1c382e5f..00000000
Binary files a/Clover/app/src/main/res/drawable-mdpi/ic_close_grey600_24dp.png and /dev/null differ
diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png
deleted file mode 100644
index e80681ae..00000000
Binary files a/Clover/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png and /dev/null differ
diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_image_black_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_image_black_24dp.png
new file mode 100644
index 00000000..377ce133
Binary files /dev/null and b/Clover/app/src/main/res/drawable-mdpi/ic_image_black_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_image_grey600_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_image_grey600_24dp.png
deleted file mode 100644
index 9470dddf..00000000
Binary files a/Clover/app/src/main/res/drawable-mdpi/ic_image_grey600_24dp.png and /dev/null differ
diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_image_white_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_image_white_24dp.png
new file mode 100644
index 00000000..d474bd57
Binary files /dev/null and b/Clover/app/src/main/res/drawable-mdpi/ic_image_white_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_send_black_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_send_black_24dp.png
new file mode 100644
index 00000000..83156aa3
Binary files /dev/null and b/Clover/app/src/main/res/drawable-mdpi/ic_send_black_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_send_grey600_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_send_grey600_24dp.png
deleted file mode 100644
index 6fef4883..00000000
Binary files a/Clover/app/src/main/res/drawable-mdpi/ic_send_grey600_24dp.png and /dev/null differ
diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_send_white_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_send_white_24dp.png
new file mode 100644
index 00000000..048d3eb2
Binary files /dev/null and b/Clover/app/src/main/res/drawable-mdpi/ic_send_white_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_settings_black_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_settings_black_24dp.png
new file mode 100644
index 00000000..c59419c0
Binary files /dev/null and b/Clover/app/src/main/res/drawable-mdpi/ic_settings_black_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_settings_grey600_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index 5a1b41f0..00000000
Binary files a/Clover/app/src/main/res/drawable-mdpi/ic_settings_grey600_24dp.png and /dev/null differ
diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_settings_white_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_settings_white_24dp.png
new file mode 100644
index 00000000..8909c355
Binary files /dev/null and b/Clover/app/src/main/res/drawable-mdpi/ic_settings_white_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_clear_black_24dp.png b/Clover/app/src/main/res/drawable-xhdpi/ic_clear_black_24dp.png
new file mode 100644
index 00000000..6bc43729
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xhdpi/ic_clear_black_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_clear_white_24dp.png b/Clover/app/src/main/res/drawable-xhdpi/ic_clear_white_24dp.png
new file mode 100644
index 00000000..b7c7ffd0
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xhdpi/ic_clear_white_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_close_grey600_24dp.png b/Clover/app/src/main/res/drawable-xhdpi/ic_close_grey600_24dp.png
deleted file mode 100644
index fb9f88d2..00000000
Binary files a/Clover/app/src/main/res/drawable-xhdpi/ic_close_grey600_24dp.png and /dev/null differ
diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png b/Clover/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png
deleted file mode 100644
index 76e07f09..00000000
Binary files a/Clover/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png and /dev/null differ
diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_image_black_24dp.png b/Clover/app/src/main/res/drawable-xhdpi/ic_image_black_24dp.png
new file mode 100644
index 00000000..6b7cd783
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xhdpi/ic_image_black_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_image_grey600_24dp.png b/Clover/app/src/main/res/drawable-xhdpi/ic_image_grey600_24dp.png
deleted file mode 100644
index 56cba791..00000000
Binary files a/Clover/app/src/main/res/drawable-xhdpi/ic_image_grey600_24dp.png and /dev/null differ
diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_image_white_24dp.png b/Clover/app/src/main/res/drawable-xhdpi/ic_image_white_24dp.png
new file mode 100644
index 00000000..2642b9e0
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xhdpi/ic_image_white_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_send_black_24dp.png b/Clover/app/src/main/res/drawable-xhdpi/ic_send_black_24dp.png
new file mode 100644
index 00000000..fd36be8b
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xhdpi/ic_send_black_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_send_grey600_24dp.png b/Clover/app/src/main/res/drawable-xhdpi/ic_send_grey600_24dp.png
deleted file mode 100644
index e1380462..00000000
Binary files a/Clover/app/src/main/res/drawable-xhdpi/ic_send_grey600_24dp.png and /dev/null differ
diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_send_white_24dp.png b/Clover/app/src/main/res/drawable-xhdpi/ic_send_white_24dp.png
new file mode 100644
index 00000000..ef59e776
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xhdpi/ic_send_white_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png b/Clover/app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png
new file mode 100644
index 00000000..e84e188a
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png b/Clover/app/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index 2251d2bb..00000000
Binary files a/Clover/app/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png and /dev/null differ
diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png b/Clover/app/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png
new file mode 100644
index 00000000..5caedc8e
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_clear_black_24dp.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_clear_black_24dp.png
new file mode 100644
index 00000000..51b4401c
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxhdpi/ic_clear_black_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_clear_white_24dp.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_clear_white_24dp.png
new file mode 100644
index 00000000..6b717e0d
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxhdpi/ic_clear_white_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_close_grey600_24dp.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_close_grey600_24dp.png
deleted file mode 100644
index 3179d765..00000000
Binary files a/Clover/app/src/main/res/drawable-xxhdpi/ic_close_grey600_24dp.png and /dev/null differ
diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png
deleted file mode 100644
index 0eb9d8b0..00000000
Binary files a/Clover/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png and /dev/null differ
diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_image_black_24dp.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_image_black_24dp.png
new file mode 100644
index 00000000..7297bd5d
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxhdpi/ic_image_black_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_image_grey600_24dp.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_image_grey600_24dp.png
deleted file mode 100644
index b69c5204..00000000
Binary files a/Clover/app/src/main/res/drawable-xxhdpi/ic_image_grey600_24dp.png and /dev/null differ
diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_image_white_24dp.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_image_white_24dp.png
new file mode 100644
index 00000000..f9f1defa
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxhdpi/ic_image_white_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_send_black_24dp.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_send_black_24dp.png
new file mode 100644
index 00000000..40b74ebc
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxhdpi/ic_send_black_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_send_grey600_24dp.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_send_grey600_24dp.png
deleted file mode 100644
index 2c7a8026..00000000
Binary files a/Clover/app/src/main/res/drawable-xxhdpi/ic_send_grey600_24dp.png and /dev/null differ
diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_send_white_24dp.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_send_white_24dp.png
new file mode 100644
index 00000000..1bc7552a
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxhdpi/ic_send_white_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png
new file mode 100644
index 00000000..3023ff8d
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index 6a70402b..00000000
Binary files a/Clover/app/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png and /dev/null differ
diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png
new file mode 100644
index 00000000..eabb0a2b
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_clear_black_24dp.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_clear_black_24dp.png
new file mode 100644
index 00000000..df42feec
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxxhdpi/ic_clear_black_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_clear_white_24dp.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_clear_white_24dp.png
new file mode 100644
index 00000000..39641921
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxxhdpi/ic_clear_white_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_close_grey600_24dp.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_close_grey600_24dp.png
deleted file mode 100644
index e3121dbf..00000000
Binary files a/Clover/app/src/main/res/drawable-xxxhdpi/ic_close_grey600_24dp.png and /dev/null differ
diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png
deleted file mode 100644
index 7b2a480a..00000000
Binary files a/Clover/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png and /dev/null differ
diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_image_black_24dp.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_image_black_24dp.png
new file mode 100644
index 00000000..ebe206ff
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxxhdpi/ic_image_black_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_image_grey600_24dp.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_image_grey600_24dp.png
deleted file mode 100644
index c5cb5e96..00000000
Binary files a/Clover/app/src/main/res/drawable-xxxhdpi/ic_image_grey600_24dp.png and /dev/null differ
diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_image_white_24dp.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_image_white_24dp.png
new file mode 100644
index 00000000..2ffdb55f
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxxhdpi/ic_image_white_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_send_black_24dp.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_send_black_24dp.png
new file mode 100644
index 00000000..761929f4
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxxhdpi/ic_send_black_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_send_grey600_24dp.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_send_grey600_24dp.png
deleted file mode 100644
index 9b2c6196..00000000
Binary files a/Clover/app/src/main/res/drawable-xxxhdpi/ic_send_grey600_24dp.png and /dev/null differ
diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_send_white_24dp.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_send_white_24dp.png
new file mode 100644
index 00000000..6aeaa850
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxxhdpi/ic_send_white_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png
new file mode 100644
index 00000000..476d5c97
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png differ
diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_settings_grey600_24dp.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index 5eba9e8e..00000000
Binary files a/Clover/app/src/main/res/drawable-xxxhdpi/ic_settings_grey600_24dp.png and /dev/null differ
diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png
new file mode 100644
index 00000000..507c5edd
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png differ
diff --git a/Clover/app/src/main/res/layout/layout_reply_input.xml b/Clover/app/src/main/res/layout/layout_reply_input.xml
index 6fb95fe9..8f857761 100644
--- a/Clover/app/src/main/res/layout/layout_reply_input.xml
+++ b/Clover/app/src/main/res/layout/layout_reply_input.xml
@@ -168,15 +168,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                 android:id="@+id/attach"
                 android:layout_width="36dp"
                 android:layout_height="36dp"
-                android:padding="6dp"
-                android:src="@drawable/ic_image_grey600_24dp" />
+                android:padding="6dp" />
 
             <ImageView
                 android:id="@+id/submit"
                 android:layout_width="36dp"
                 android:layout_height="36dp"
-                android:padding="6dp"
-                android:src="@drawable/ic_send_grey600_24dp" />
+                android:padding="6dp" />
 
         </LinearLayout>
 
diff --git a/Clover/app/src/main/res/layout/post_replies.xml b/Clover/app/src/main/res/layout/post_replies.xml
index 1981029b..c074f060 100644
--- a/Clover/app/src/main/res/layout/post_replies.xml
+++ b/Clover/app/src/main/res/layout/post_replies.xml
@@ -53,7 +53,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:drawableLeft="@drawable/ic_arrow_back_black_24dp"
                     android:drawablePadding="8dp"
                     android:gravity="center_vertical"
                     android:paddingRight="20dp"
@@ -73,7 +72,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:drawableLeft="@drawable/ic_done_black_24dp"
                     android:drawablePadding="8dp"
                     android:gravity="center_vertical"
                     android:paddingRight="20dp"
diff --git a/Clover/app/src/main/res/layout/post_replies_bottombuttons.xml b/Clover/app/src/main/res/layout/post_replies_bottombuttons.xml
index b4bf65e4..daf82548 100644
--- a/Clover/app/src/main/res/layout/post_replies_bottombuttons.xml
+++ b/Clover/app/src/main/res/layout/post_replies_bottombuttons.xml
@@ -59,7 +59,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:drawableLeft="@drawable/ic_arrow_back_black_24dp"
                     android:drawablePadding="8dp"
                     android:gravity="center_vertical"
                     android:paddingRight="20dp"
@@ -79,7 +78,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:drawableLeft="@drawable/ic_done_black_24dp"
                     android:drawablePadding="8dp"
                     android:gravity="center_vertical"
                     android:paddingRight="20dp"
diff --git a/Clover/app/src/main/res/values/styles.xml b/Clover/app/src/main/res/values/styles.xml
index 84d82c71..f8e59e22 100644
--- a/Clover/app/src/main/res/values/styles.xml
+++ b/Clover/app/src/main/res/values/styles.xml
@@ -65,6 +65,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     </style>
 
     <style name="Chan.Theme.Dark" parent="Theme.AppCompat.NoActionBar">
+        <item name="dropdown_dark_color">#ffffffff</item>
+        <item name="dropdown_dark_pressed_color">#88ffffff</item>
+
         <item name="setting_description_top">@drawable/setting_description_top_dark</item>
         <item name="setting_description_bottom">@drawable/setting_description_bottom_dark</item>