diff --git a/app/src/main/java/gr/thmmy/mthmmy/utils/EditorView.java b/app/src/main/java/gr/thmmy/mthmmy/utils/EditorView.java
index 28b9df00..2eee42d3 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/utils/EditorView.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/utils/EditorView.java
@@ -38,7 +38,6 @@ public class EditorView extends LinearLayout {
     }
 
     private void init(Context context, AttributeSet attrs) {
-        setOrientation(VERTICAL);
         LayoutInflater.from(context).inflate(R.layout.editor_view, this, true);
 
         editText = findViewById(R.id.editor_edittext);
diff --git a/app/src/main/java/gr/thmmy/mthmmy/utils/EmojiKeyboard.java b/app/src/main/java/gr/thmmy/mthmmy/utils/EmojiKeyboard.java
index 74c408f0..06dff3d4 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/utils/EmojiKeyboard.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/utils/EmojiKeyboard.java
@@ -37,7 +37,7 @@ public class EmojiKeyboard extends LinearLayout {
         LayoutInflater.from(context).inflate(R.layout.emoji_keyboard, this, true);
 
         emojis.append(R.drawable.emoji_smiley, ":)");
-        emojis.append(R.drawable.emojI_wink, ";)");
+        emojis.append(R.drawable.emoji_wink, ";)");
         emojis.append(R.drawable.emoji_cheesy, ":D");
         emojis.append(R.drawable.emoji_grin, ";D");
         // removed repeated angry emoji
diff --git a/app/src/main/java/gr/thmmy/mthmmy/utils/ImageKeyboardAdapter.java b/app/src/main/java/gr/thmmy/mthmmy/utils/ImageKeyboardAdapter.java
index c175994c..b19b6204 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/utils/ImageKeyboardAdapter.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/utils/ImageKeyboardAdapter.java
@@ -18,10 +18,6 @@ public class ImageKeyboardAdapter extends BaseAdapter {
     public ImageKeyboardAdapter(Context context, Integer[] emojiIds) {
         this.context = context;
         this.emojiIds = emojiIds;
-        // sort images by width
-        Arrays.sort(this.emojiIds, (img1, img2) ->
-                context.getResources().getDrawable(img1).getIntrinsicWidth() -
-                        context.getResources().getDrawable(img2).getIntrinsicWidth());
     }
 
     @Override
diff --git a/app/src/main/res/drawable/emojI_wink.gif b/app/src/main/res/drawable/emojI_wink.gif
deleted file mode 100644
index 1022bce7..00000000
Binary files a/app/src/main/res/drawable/emojI_wink.gif and /dev/null differ