diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java
index 7b3065d9ce..d0b785f908 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java
@@ -7,14 +7,11 @@ import android.content.Context;
 import android.graphics.PointF;
 import android.graphics.Rect;
 import android.os.Build;
-import android.os.VibrationEffect;
-import android.os.Vibrator;
 import android.util.AttributeSet;
 import android.view.HapticFeedbackConstants;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.animation.AccelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.Interpolator;
 import android.widget.RelativeLayout;
@@ -34,13 +31,10 @@ import com.annimon.stream.Stream;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
 import org.thoughtcrime.securesms.components.MaskView;
-import org.thoughtcrime.securesms.components.emoji.EmojiTextView;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.ReactionRecord;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.MessageRecordUtil;
-import org.thoughtcrime.securesms.util.ServiceUtil;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
@@ -365,7 +359,7 @@ public final class ConversationReactionOverlay extends RelativeLayout {
         .scaleY(1.5f)
         .scaleX(1.5f)
         .translationY(-selectedVerticalTranslation)
-        .setDuration(400)
+        .setDuration(200)
         .setInterpolator(INTERPOLATOR)
         .start();
   }
@@ -375,7 +369,7 @@ public final class ConversationReactionOverlay extends RelativeLayout {
         .scaleX(1.0f)
         .scaleY(1.0f)
         .translationY(0)
-        .setDuration(400)
+        .setDuration(200)
         .setInterpolator(INTERPOLATOR)
         .start();
   }
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 86e4dd1960..08165d5942 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -140,11 +140,11 @@
     <dimen name="contact_selection_item_height">@dimen/selection_item_header_height</dimen>
 
     <dimen name="conversation_reaction_scrubber_height">136dp</dimen>
-    <dimen name="conversation_reaction_scrubber_distance">40dp</dimen>
-    <dimen name="conversation_reaction_touch_deadzone_size">60dp</dimen>
+    <dimen name="conversation_reaction_scrubber_distance">25dp</dimen>
+    <dimen name="conversation_reaction_touch_deadzone_size">40dp</dimen>
     <dimen name="conversation_reaction_scrub_deadzone_distance_from_touch_top">136dp</dimen>
-    <dimen name="conversation_reaction_scrub_deadzone_distance_from_touch_bottom">40dp</dimen>
-    <dimen name="conversation_reaction_scrub_vertical_translation">20dp</dimen>
+    <dimen name="conversation_reaction_scrub_deadzone_distance_from_touch_bottom">30dp</dimen>
+    <dimen name="conversation_reaction_scrub_vertical_translation">25dp</dimen>
     <dimen name="conversation_reaction_scrub_horizontal_margin">16dp</dimen>
 
     <dimen name="storage_legend_circle_size">8dp</dimen>