diff --git a/Clover/app/src/main/java/org/floens/chan/ui/fragment/PostRepliesFragment.java b/Clover/app/src/main/java/org/floens/chan/ui/fragment/PostRepliesFragment.java
index 74d7dc38..5cc4e400 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/fragment/PostRepliesFragment.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/fragment/PostRepliesFragment.java
@@ -25,11 +25,13 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
+import android.widget.TextView;
 
 import org.floens.chan.R;
 import org.floens.chan.core.manager.ThreadManager;
 import org.floens.chan.core.model.Post;
 import org.floens.chan.ui.view.PostView;
+import org.floens.chan.utils.ThemeHelper;
 
 import java.util.List;
 
@@ -94,6 +96,11 @@ public class PostRepliesFragment extends DialogFragment {
             }
         });
 
+        if (!ThemeHelper.getInstance().getTheme().isLightTheme) {
+            ((TextView)container.findViewById(R.id.replies_back_icon)).setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_action_back_dark, 0, 0, 0);
+            ((TextView)container.findViewById(R.id.replies_close_icon)).setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_action_done_dark, 0, 0, 0);
+        }
+
         return container;
     }
 
diff --git a/Clover/app/src/main/java/org/floens/chan/utils/ThemeHelper.java b/Clover/app/src/main/java/org/floens/chan/utils/ThemeHelper.java
index d1b4d8a6..8cab15dc 100644
--- a/Clover/app/src/main/java/org/floens/chan/utils/ThemeHelper.java
+++ b/Clover/app/src/main/java/org/floens/chan/utils/ThemeHelper.java
@@ -9,16 +9,18 @@ import org.floens.chan.core.ChanPreferences;
 
 public class ThemeHelper {
     public enum Theme {
-        LIGHT("light", R.style.AppTheme),
-        DARK("dark", R.style.AppTheme_Dark),
-        BLACK("black", R.style.AppTheme_Dark_Black);
+        LIGHT("light", R.style.AppTheme, true),
+        DARK("dark", R.style.AppTheme_Dark, false),
+        BLACK("black", R.style.AppTheme_Dark_Black, false);
 
         public String name;
         public int resValue;
+        public boolean isLightTheme;
 
-        private Theme(String name, int resValue) {
+        private Theme(String name, int resValue, boolean isLightTheme) {
             this.name = name;
             this.resValue = resValue;
+            this.isLightTheme = isLightTheme;
         }
     }
 
diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_action_back_dark.png b/Clover/app/src/main/res/drawable-hdpi/ic_action_back_dark.png
new file mode 100644
index 00000000..6bb7a0b0
Binary files /dev/null and b/Clover/app/src/main/res/drawable-hdpi/ic_action_back_dark.png differ
diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_action_done_dark.png b/Clover/app/src/main/res/drawable-hdpi/ic_action_done_dark.png
new file mode 100644
index 00000000..4c2e8444
Binary files /dev/null and b/Clover/app/src/main/res/drawable-hdpi/ic_action_done_dark.png differ
diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_action_back_dark.png b/Clover/app/src/main/res/drawable-mdpi/ic_action_back_dark.png
new file mode 100644
index 00000000..8da54cde
Binary files /dev/null and b/Clover/app/src/main/res/drawable-mdpi/ic_action_back_dark.png differ
diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_action_done_dark.png b/Clover/app/src/main/res/drawable-mdpi/ic_action_done_dark.png
new file mode 100644
index 00000000..41107b87
Binary files /dev/null and b/Clover/app/src/main/res/drawable-mdpi/ic_action_done_dark.png differ
diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_action_back_dark.png b/Clover/app/src/main/res/drawable-xhdpi/ic_action_back_dark.png
new file mode 100644
index 00000000..d5760406
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xhdpi/ic_action_back_dark.png differ
diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_action_done_dark.png b/Clover/app/src/main/res/drawable-xhdpi/ic_action_done_dark.png
new file mode 100644
index 00000000..6ee32b64
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xhdpi/ic_action_done_dark.png differ
diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_action_back_dark.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_action_back_dark.png
new file mode 100644
index 00000000..4919a8d7
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxhdpi/ic_action_back_dark.png differ
diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_action_done_dark.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_action_done_dark.png
new file mode 100644
index 00000000..68c41dec
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxhdpi/ic_action_done_dark.png differ
diff --git a/Clover/app/src/main/res/layout/post_replies.xml b/Clover/app/src/main/res/layout/post_replies.xml
index 381f8415..7ca33482 100644
--- a/Clover/app/src/main/res/layout/post_replies.xml
+++ b/Clover/app/src/main/res/layout/post_replies.xml
@@ -1,59 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:minWidth="320dp"
     android:minHeight="200dp"
-    android:orientation="vertical" >
-    
+    android:orientation="vertical">
+
     <LinearLayout
-	    android:layout_width="match_parent"
-	    android:layout_height="match_parent"
-	    android:baselineAligned="false"
-	    android:orientation="horizontal"
-	    android:divider="?android:attr/dividerVertical"
-	    android:showDividers="middle"
-	    android:dividerPadding="12dp">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:baselineAligned="false"
+        android:orientation="horizontal"
+        android:divider="?android:attr/dividerVertical"
+        android:showDividers="middle"
+        android:dividerPadding="12dp">
+
+        <FrameLayout
+            style="?android:actionButtonStyle"
+            android:id="@+id/replies_back"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1">
 
-	    <FrameLayout
-		    style="?android:actionButtonStyle"
-		    android:id="@+id/replies_back"
-		    android:layout_width="0dp"
-		    android:layout_height="match_parent"
-		    android:layout_weight="1">
-		
-		    <TextView style="?android:actionBarTabTextStyle"
-		        android:layout_width="wrap_content"
-		        android:layout_height="wrap_content"
-		        android:layout_gravity="center"
-		        android:paddingRight="20dp"
-		        android:drawableLeft="@drawable/ic_action_back"
-		        android:drawablePadding="8dp"
-		        android:gravity="center_vertical"
-		        android:text="@string/post_replies_back" />
-		</FrameLayout>
-	    <FrameLayout
-		    style="?android:actionButtonStyle"
-		    android:id="@+id/replies_close"
-		    android:layout_width="0dp"
-		    android:layout_height="match_parent"
-		    android:layout_weight="1">
-		
-		    <TextView style="?android:actionBarTabTextStyle"
-		        android:layout_width="wrap_content"
-		        android:layout_height="wrap_content"
-		        android:layout_gravity="center"
-		        android:paddingRight="20dp"
-		        android:drawableLeft="@drawable/ic_action_done"
-		        android:drawablePadding="8dp"
-		        android:gravity="center_vertical"
-		        android:text="@string/post_replies_close" />
-		</FrameLayout>
-	</LinearLayout>
+            <TextView
+                style="?android:actionBarTabTextStyle"
+                android:id="@+id/replies_back_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:paddingRight="20dp"
+                android:drawableLeft="@drawable/ic_action_back"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:text="@string/post_replies_back"/>
+        </FrameLayout>
 
-    <ListView 
+        <FrameLayout
+            style="?android:actionButtonStyle"
+            android:id="@+id/replies_close"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1">
+
+            <TextView
+                style="?android:actionBarTabTextStyle"
+                android:id="@+id/replies_close_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:paddingRight="20dp"
+                android:drawableLeft="@drawable/ic_action_done"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:text="@string/post_replies_close"/>
+        </FrameLayout>
+    </LinearLayout>
+
+    <ListView
         android:id="@+id/post_list"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-    
+        android:layout_height="match_parent"/>
+
 </LinearLayout>