diff --git a/assets/emoji-nature.png b/assets/emoji-nature.png
index a0a1fc829e..695e8e9971 100644
Binary files a/assets/emoji-nature.png and b/assets/emoji-nature.png differ
diff --git a/assets/emoji-objects.png b/assets/emoji-objects.png
index 7071bd6bf6..b3b1fe5e20 100644
Binary files a/assets/emoji-objects.png and b/assets/emoji-objects.png differ
diff --git a/assets/emoji-people.png b/assets/emoji-people.png
index 1cae895c28..7239a83347 100644
Binary files a/assets/emoji-people.png and b/assets/emoji-people.png differ
diff --git a/assets/emoji-places.png b/assets/emoji-places.png
index c6b7220c30..b1dd5365c4 100644
Binary files a/assets/emoji-places.png and b/assets/emoji-places.png differ
diff --git a/assets/emoji-symbol.png b/assets/emoji-symbol.png
index 85bf269d34..4d9b917afc 100644
Binary files a/assets/emoji-symbol.png and b/assets/emoji-symbol.png differ
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java
index 3472010bbf..3ee1f311c0 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java
@@ -46,10 +46,10 @@ public class EmojiProvider {
 
   public static final double EMOJI_FULL       = 1.00;
   public static final double EMOJI_SMALL      = 0.60;
-  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;
+  public static final int    EMOJI_RAW_HEIGHT = 64;
+  public static final int    EMOJI_RAW_WIDTH  = 64;
+  public static final int    EMOJI_VERT_PAD   = 0;
+  public static final int    EMOJI_PER_ROW    = 32;
 
   private final Context context;
   private final double  drawWidth;
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiView.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiView.java
index 1aaa17eec5..7d35dee120 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/EmojiView.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiView.java
@@ -19,7 +19,7 @@ public class EmojiView extends View implements Drawable.Callback {
   private String   emoji;
   private Drawable drawable;
 
-  private final Paint paint      = new Paint(Paint.ANTI_ALIAS_FLAG);
+  private final Paint paint      = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);
   private final Rect  textBounds = new Rect();
 
   public EmojiView(Context context) {