diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListArchiveFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListArchiveFragment.java
index eeabb5ac3..552c178a9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListArchiveFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListArchiveFragment.java
@@ -106,7 +106,7 @@ public class ConversationListArchiveFragment extends ConversationListFragment im
 
   @Override
   protected @DrawableRes int getArchiveIconRes() {
-    return R.drawable.ic_unarchive_white_36dp;
+    return R.drawable.ic_unarchive_24;
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
index c26d86d9e..19681b701 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
@@ -1354,7 +1354,8 @@ public class ConversationListFragment extends MainFragment implements ActionMode
 
   private class ArchiveListenerCallback extends ItemTouchHelper.SimpleCallback {
 
-    private static final float MIN_ICON_SCALE = 0.75f;
+    private static final float MIN_ICON_SCALE = 0.85f;
+    private static final float MAX_ICON_SCALE = 1.25f;
 
     private final int archiveColorStart;
     private final int archiveColorEnd;
@@ -1410,15 +1411,15 @@ public class ConversationListFragment extends MainFragment implements ActionMode
         float     percentDx       = Math.abs(dX) / viewHolder.itemView.getWidth();
         int       color           = ArgbEvaluatorCompat.getInstance().evaluate(Math.min(1f, percentDx * (1 / 0.25f)), archiveColorStart, archiveColorEnd);
         float     scaleStartPoint = DimensionUnit.DP.toPixels(48f);
-        float     scaleEndPoint   = DimensionUnit.DP.toPixels(112f);
+        float     scaleEndPoint   = DimensionUnit.DP.toPixels(96f);
 
         float scale;
         if (dX < scaleStartPoint) {
           scale = MIN_ICON_SCALE;
         } else if (dX > scaleEndPoint) {
-          scale = 1f;
+          scale = MAX_ICON_SCALE;
         } else {
-          scale = Math.min(1f, MIN_ICON_SCALE + ((dX - scaleStartPoint) / (scaleEndPoint - scaleStartPoint)) * (1f - MIN_ICON_SCALE));
+          scale = Math.min(MAX_ICON_SCALE, MIN_ICON_SCALE + ((dX - scaleStartPoint) / (scaleEndPoint - scaleStartPoint)) * (MAX_ICON_SCALE - MIN_ICON_SCALE));
         }
 
         if (dX > 0) {