diff --git a/assets/emoji-0.png b/assets/emoji-0.png
index 22c95a5202..1cae895c28 100644
Binary files a/assets/emoji-0.png and b/assets/emoji-0.png differ
diff --git a/assets/emoji-1.png b/assets/emoji-1.png
index cab8c1174e..7071bd6bf6 100644
Binary files a/assets/emoji-1.png and b/assets/emoji-1.png differ
diff --git a/assets/emoji-2.png b/assets/emoji-2.png
index 3170efab21..a0a1fc829e 100644
Binary files a/assets/emoji-2.png and b/assets/emoji-2.png differ
diff --git a/assets/emoji-3.png b/assets/emoji-3.png
index 750972072a..c6b7220c30 100644
Binary files a/assets/emoji-3.png and b/assets/emoji-3.png differ
diff --git a/assets/emoji-4.png b/assets/emoji-4.png
index 35ae4bae63..85bf269d34 100644
Binary files a/assets/emoji-4.png and b/assets/emoji-4.png differ
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 49856c8b2e..1b1865093f 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="emoji_drawer_size">36sp</dimen>
+    <dimen name="emoji_drawer_size">32sp</dimen>
     <dimen name="min_emoji_drawer_height">200dp</dimen>
-    <dimen name="emoji_drawer_item_padding">3dp</dimen>
+    <dimen name="emoji_drawer_item_padding">5dp</dimen>
     <dimen name="emoji_drawer_indicator_height">1.5dp</dimen>
     <dimen name="emoji_drawer_left_right_padding">5dp</dimen>
     <dimen name="conversation_item_date_text_size">12sp</dimen>
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java
index 2a6351962d..5817b384b4 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java
@@ -48,9 +48,9 @@ public class EmojiProvider {
 
   public static final double EMOJI_FULL       = 1.00;
   public static final double EMOJI_SMALL      = 0.50;
-  public static final int    EMOJI_RAW_HEIGHT = 128;
-  public static final int    EMOJI_RAW_WIDTH  = 136;
-  public static final int    EMOJI_VERT_PAD   = 8;
+  public static final int    EMOJI_RAW_HEIGHT = 96;
+  public static final int    EMOJI_RAW_WIDTH  = 102;
+  public static final int    EMOJI_VERT_PAD   = 6;
   public static final int    EMOJI_PER_ROW    = 15;
 
   private final Context context;
@@ -264,6 +264,7 @@ public class EmojiProvider {
         Log.w(TAG, ioe);
         throw ioe;
       } catch (BitmapDecodingException bde) {
+        Log.w(TAG, "page " + page + " failed.");
         Log.w(TAG, bde);
         throw new AssertionError("emoji sprite asset is corrupted or android decoding is broken");
       }