diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java
index ea99ef75c..01beb5948 100644
--- a/src/org/thoughtcrime/securesms/ConversationListFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java
@@ -542,7 +542,7 @@ public class ConversationListFragment extends Fragment
           if (archive) icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_unarchive_white_36dp);
           else         icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_archive_white_36dp);
 
-          if (alpha > 0) p.setColor(getResources().getColor(R.color.green_500));
+          if (alpha > 0) p.setColor(getResources().getColor(R.color.signal_primary));
           else           p.setColor(Color.WHITE);
 
           c.drawRect((float) itemView.getLeft(), (float) itemView.getTop(), dX,
diff --git a/src/org/thoughtcrime/securesms/ConversationListItem.java b/src/org/thoughtcrime/securesms/ConversationListItem.java
index 40eb80233..efcf0f66b 100644
--- a/src/org/thoughtcrime/securesms/ConversationListItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationListItem.java
@@ -313,7 +313,7 @@ public class ConversationListItem extends RelativeLayout
                                                  .textColor(Color.WHITE)
                                                  .bold()
                                                  .endConfig()
-                                                 .buildRound(String.valueOf(thread.getUnreadCount()), getResources().getColor(R.color.textsecure_primary_dark)));
+                                                 .buildRound(String.valueOf(thread.getUnreadCount()), getResources().getColor(R.color.green_A700)));
     unreadIndicator.setVisibility(View.VISIBLE);
   }
 
diff --git a/src/org/thoughtcrime/securesms/util/task/SnackbarAsyncTask.java b/src/org/thoughtcrime/securesms/util/task/SnackbarAsyncTask.java
index 2318222d0..266f7f9e9 100644
--- a/src/org/thoughtcrime/securesms/util/task/SnackbarAsyncTask.java
+++ b/src/org/thoughtcrime/securesms/util/task/SnackbarAsyncTask.java
@@ -6,6 +6,8 @@ import android.support.annotation.Nullable;
 import android.support.design.widget.Snackbar;
 import android.view.View;
 
+import org.thoughtcrime.securesms.R;
+
 public abstract class SnackbarAsyncTask<Params>
     extends AsyncTask<Params, Void, Void>
     implements View.OnClickListener
@@ -56,6 +58,7 @@ public abstract class SnackbarAsyncTask<Params>
 
     Snackbar.make(view, snackbarText, snackbarDuration)
             .setAction(snackbarActionText, this)
+            .setActionTextColor(view.getResources().getColor(R.color.white))
             .show();
   }