diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/TestEditView.java b/app/src/main/java/gr/thmmy/mthmmy/activities/TestEditView.java
index 8ea9903f..50ec8436 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/TestEditView.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/TestEditView.java
@@ -10,7 +10,6 @@ import gr.thmmy.mthmmy.utils.EditorView;
 import gr.thmmy.mthmmy.utils.EmojiKeyboard;
 
 public class TestEditView extends AppCompatActivity implements EmojiKeyboard.EmojiKeyboardOwner {
-
     EmojiKeyboard emojiKeyboard;
     EditorView editorView;
 
@@ -19,8 +18,8 @@ public class TestEditView extends AppCompatActivity implements EmojiKeyboard.Emo
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_test_edit_view);
 
-        editorView = (EditorView) findViewById(R.id.editor_view);
-        emojiKeyboard = (EmojiKeyboard) findViewById(R.id.emoji_keyboard);
+        editorView = findViewById(R.id.editor_view);
+        emojiKeyboard = findViewById(R.id.emoji_keyboard);
 
         InputConnection ic = editorView.getInputConnection();
         emojiKeyboard.setInputConnection(ic);
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 94feea0a..28b9df00 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/utils/EditorView.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/utils/EditorView.java
@@ -41,14 +41,17 @@ public class EditorView extends LinearLayout {
         setOrientation(VERTICAL);
         LayoutInflater.from(context).inflate(R.layout.editor_view, this, true);
 
-        editText = (EditText) findViewById(R.id.editor_edittext);
-        emojiButton = (AppCompatImageButton) findViewById(R.id.emoji_keyboard_button);
+        editText = findViewById(R.id.editor_edittext);
+        emojiButton = findViewById(R.id.emoji_keyboard_button);
+
         editText.setOnTouchListener((v, event) -> {
             if (emojiKeyboardVisible) return true;
             return false;
         });
+
         emojiButton.setOnClickListener(view -> {
             InputMethodManager imm = (InputMethodManager) context.getSystemService(Activity.INPUT_METHOD_SERVICE);
+            assert imm != null;
             if (emojiKeyboardVisible) {
                 editText.requestFocus();
                 imm.showSoftInput(editText, InputMethodManager.SHOW_IMPLICIT);
@@ -61,7 +64,8 @@ public class EditorView extends LinearLayout {
             emojiKeyboardVisible = !emojiKeyboardVisible;
             emojiKeyboardOwner.setEmojiKeyboardVisible(emojiKeyboardVisible);
         });
-        submitButton = (AppCompatImageButton) findViewById(R.id.submit_button);
+
+        submitButton = findViewById(R.id.submit_button);
     }
 
     public Editable getText() {
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 fecee5c5..74c408f0 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/utils/EmojiKeyboard.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/utils/EmojiKeyboard.java
@@ -36,131 +36,129 @@ public class EmojiKeyboard extends LinearLayout {
     public void init(Context context, AttributeSet attrs) {
         LayoutInflater.from(context).inflate(R.layout.emoji_keyboard, this, true);
 
-        emojis.append(R.drawable.smiley, ":)");
-        emojis.append(R.drawable.wink, ";)");
-        emojis.append(R.drawable.cheesy, ":D");
-        emojis.append(R.drawable.grin, ";D");
-        // second alias: ^angry^
-        emojis.append(R.drawable.angry, ">:(");
-        emojis.append(R.drawable.sad, ":(");
-        emojis.append(R.drawable.shocked, ":o");
-        emojis.append(R.drawable.cool, "8))");
-        emojis.append(R.drawable.huh, ":???:");
-        emojis.append(R.drawable.rolleyes, "::)");
-        emojis.append(R.drawable.tongue, ":P");
-        emojis.append(R.drawable.embarrassed, ":-[");
-        emojis.append(R.drawable.lipsrsealed, ":-X");
-        emojis.append(R.drawable.undecided, ":-\\\\");
-        emojis.append(R.drawable.kiss, ":-*");
-        emojis.append(R.drawable.cry, ":'(");
+        emojis.append(R.drawable.emoji_smiley, ":)");
+        emojis.append(R.drawable.emojI_wink, ";)");
+        emojis.append(R.drawable.emoji_cheesy, ":D");
+        emojis.append(R.drawable.emoji_grin, ";D");
+        // removed repeated angry emoji
+        emojis.append(R.drawable.emoji_angry, ">:(");
+        emojis.append(R.drawable.emoji_sad, ":(");
+        emojis.append(R.drawable.emoji_shocked, ":o");
+        emojis.append(R.drawable.emoji_cool, "8))");
+        emojis.append(R.drawable.emoji_huh, ":???:");
+        emojis.append(R.drawable.emoji_rolleyes, "::)");
+        emojis.append(R.drawable.emoji_tongue, ":P");
+        emojis.append(R.drawable.emoji_embarrassed, ":-[");
+        emojis.append(R.drawable.emoji_lipsrsealed, ":-X");
+        emojis.append(R.drawable.emoji_undecided, ":-\\\\");
+        emojis.append(R.drawable.emoji_kiss, ":-*");
+        emojis.append(R.drawable.emoji_cry, ":'(");
+        emojis.append(R.drawable.emoji_heart, "<3");
+        // removed repeated lock emoji
+        emojis.append(R.drawable.emoji_locked, "^lock^");
+        emojis.append(R.drawable.emoji_roll_over, "^rollover^");
+        emojis.append(R.drawable.emoji_redface, "^redface^");
+        emojis.append(R.drawable.emoji_confused, "^confused^");
+        emojis.append(R.drawable.emoji_innocent, "^innocent^");
+        emojis.append(R.drawable.emoji_sleep, "^sleep^");
+        emojis.append(R.drawable.emoji_lips_sealed, "^sealed^");
+        emojis.append(R.drawable.emoji_cool2, "^cool^");
+        emojis.append(R.drawable.emoji_crazy, "^crazy^");
+        emojis.append(R.drawable.emoji_mad, "^mad^");
+        emojis.append(R.drawable.emoji_wav, "^wav^");
+        emojis.append(R.drawable.emoji_binkybaby, "^binkybaby^");
+        emojis.append(R.drawable.emoji_police, "^police^");
+        emojis.append(R.drawable.emoji_dontknow, "^dontknow^");
+        //removed repeated angry hot emoji
+        emojis.append(R.drawable.emoji_angry_hot, "^angryhot^");
+        emojis.append(R.drawable.emoji_foyska, "^fouska^");
+        emojis.append(R.drawable.emoji_e10_7_3e, "^sfinaki^");
+        emojis.append(R.drawable.emoji_bang_head, "^banghead^");
+        emojis.append(R.drawable.emoji_crybaby, "^crybaby^");
+        emojis.append(R.drawable.emoji_hello, "^hello^");
+        emojis.append(R.drawable.emoji_jerk, "^jerk^");
+        emojis.append(R.drawable.emoji_nono, "^nono^");
+        emojis.append(R.drawable.emoji_notworthy, "^notworthy^");
+        emojis.append(R.drawable.emoji_off_topic, "^off-topic^");
+        emojis.append(R.drawable.emoji_puke, "^puke^");
+        emojis.append(R.drawable.emoji_shout, "^shout^");
+        emojis.append(R.drawable.emoji_slurp, "^slurp^");
+        emojis.append(R.drawable.emoji_superconfused, "^superconfused^");
+        emojis.append(R.drawable.emoji_superinnocent, "^superinnocent^");
+        emojis.append(R.drawable.emoji_cell_phone, "^cellPhone^");
+        emojis.append(R.drawable.emoji_idiot, "^idiot^");
+        emojis.append(R.drawable.emoji_knuppel, "^knuppel^");
+        emojis.append(R.drawable.emoji_tickedoff, "^tickedOff^");
+        emojis.append(R.drawable.emoji_peace, "^peace^");
+        emojis.append(R.drawable.emoji_suspicious, "^suspicious^");
+        emojis.append(R.drawable.emoji_caffine, "^caffine^");
+        emojis.append(R.drawable.emoji_argue, "^argue^");
+        emojis.append(R.drawable.emoji_banned2, "^banned2^");
+        emojis.append(R.drawable.emoji_banned, "^banned^");
+        emojis.append(R.drawable.emoji_bath, "^bath^");
+        emojis.append(R.drawable.emoji_beg, "^beg^");
+        emojis.append(R.drawable.emoji_bluescreen, "^bluescreen^");
+        emojis.append(R.drawable.emoji_boil, "^boil^");
+        emojis.append(R.drawable.emoji_bye, "^bye^");
+        emojis.append(R.drawable.emoji_callmerip, "^callmerip^");
+        emojis.append(R.drawable.emoji_carnaval, "^carnaval^");
+        emojis.append(R.drawable.emoji_clap, "^clap^");
+        emojis.append(R.drawable.emoji_coffeepot, "^coffepot^");
+        emojis.append(R.drawable.emoji_crap, "^crap^");
+        emojis.append(R.drawable.emoji_curses, "^curses^");
+        emojis.append(R.drawable.emoji_funny, "^funny^");
+        emojis.append(R.drawable.emoji_guitar1, "^guitar^");
+        emojis.append(R.drawable.emoji_icon_kissy, "^kissy^");
+        emojis.append(R.drawable.emoji_band, "^band^");
+        emojis.append(R.drawable.emoji_ivres, "^ivres^");
+        emojis.append(R.drawable.emoji_kaloe, "^kaloe^");
+        emojis.append(R.drawable.emoji_kremala, "^kremala^");
+        emojis.append(R.drawable.emoji_moon, "^moon^");
+        emojis.append(R.drawable.emoji_mopping, "^mopping^");
+        emojis.append(R.drawable.emoji_mountza, "^mountza^");
+        emojis.append(R.drawable.emoji_pcsleep, "^pcsleep^");
+        emojis.append(R.drawable.emoji_pinokio, "^pinokio^");
+        emojis.append(R.drawable.emoji_poke, "^poke^");
+        emojis.append(R.drawable.emoji_seestars, "^seestars^");
+        emojis.append(R.drawable.emoji_sfyri, "^sfyri^");
+        emojis.append(R.drawable.emoji_spam2, "^spam^");
+        emojis.append(R.drawable.emoji_esuper, "^super^");
+        emojis.append(R.drawable.emoji_tafos, "^tafos^");
+        emojis.append(R.drawable.emoji_tomatomourh, "^tomato^");
+        emojis.append(R.drawable.emoji_ytold, "^ytold^");
+        emojis.append(R.drawable.emoji_beer2, "^beer^");
+        emojis.append(R.drawable.emoji_yu, "^yue^");
+        emojis.append(R.drawable.emoji_a_eatpaper, "^eatpaper^");
+        emojis.append(R.drawable.emoji_fritz, "^fritz^");
+        emojis.append(R.drawable.emoji_wade, "^wade^");
+        emojis.append(R.drawable.emoji_lypi, "^lypi^");
+        emojis.append(R.drawable.emoji_megashok1wq, "^aytoxeir^");
+        emojis.append(R.drawable.emoji_victory, "^victory^");
+        emojis.append(R.drawable.emoji_filarakia, "^filarakia^");
+        emojis.append(R.drawable.emoji_bonjour_97213, "^hat^");
+        emojis.append(R.drawable.emoji_curtseyqi9, "^miss^");
+        emojis.append(R.drawable.emoji_rofl, "^rolfmao^");
+        emojis.append(R.drawable.emoji_question, "^que^");
+        emojis.append(R.drawable.emoji_shifty, "^shifty^");
+        emojis.append(R.drawable.emoji_shy, "^shy^");
+        emojis.append(R.drawable.emoji_music, "^music_listen^");
+        emojis.append(R.drawable.emoji_shamed_bag, "^bagface^");
+        emojis.append(R.drawable.emoji_rotfl, "^rotate^");
+        emojis.append(R.drawable.emoji_love, "^love^");
+        emojis.append(R.drawable.emoji_speech, "^speech^");
+        emojis.append(R.drawable.emoji_facepalm, "^facepalm^");
+        emojis.append(R.drawable.emoji_shocked2, "^shocked^");
+        emojis.append(R.drawable.emoji_extremely_shocked, "^ex_shocked^");
+        emojis.append(R.drawable.emoji_smurf, "^smurf^");
 
-        emojis.append(R.drawable.heart, "<3");
-        // this was twice in the original page for some reason, with another alias "locked"
-        emojis.append(R.drawable.locked, "^lock^");
-        emojis.append(R.drawable.roll_over, "^rollover^");
-        emojis.append(R.drawable.redface, "^redface^");
-        emojis.append(R.drawable.confused, "^confused^");
-        emojis.append(R.drawable.innocent, "^innocent^");
-        emojis.append(R.drawable.sleep, "^sleep^");
-        emojis.append(R.drawable.lips_sealed, "^sealed^");
-        emojis.append(R.drawable.cool, "^cool^");
-        emojis.append(R.drawable.crazy, "^crazy^");
-        emojis.append(R.drawable.mad, "^mad^");
-        emojis.append(R.drawable.wav, "^wav^");
-        emojis.append(R.drawable.binkybaby, "^binkybaby^");
-        emojis.append(R.drawable.police, "^police^");
-        emojis.append(R.drawable.dontknow, "^dontknow^");
-        // the next two are the same thing?
-        emojis.append(R.drawable.angry4, ":angry4:");
-        emojis.append(R.drawable.angry_hot, "^angryhot^");
-        emojis.append(R.drawable.foyska, "^fouska^");
-        emojis.append(R.drawable.e10_7_3e, "^sfinaki^");
-        emojis.append(R.drawable.bang_head, "^banghead^");
-        emojis.append(R.drawable.crybaby, "^crybaby^");
-        emojis.append(R.drawable.hello, "^hello^");
-        emojis.append(R.drawable.jerk, "^jerk^");
-        emojis.append(R.drawable.nono, "^nono^");
-        emojis.append(R.drawable.notworthy, "^notworthy^");
-        emojis.append(R.drawable.off_topic, "^off-topic^");
-        emojis.append(R.drawable.puke, "^puke^");
-        emojis.append(R.drawable.shout, "^shout^");
-        emojis.append(R.drawable.slurp, "^slurp^");
-        emojis.append(R.drawable.superconfused, "^superconfused^");
-        emojis.append(R.drawable.superinnocent, "^superinnocent^");
-        emojis.append(R.drawable.cell_phone, "^cellPhone^");
-        emojis.append(R.drawable.idiot, "^idiot^");
-        emojis.append(R.drawable.knuppel, "^knuppel^");
-        emojis.append(R.drawable.tickedoff, "^tickedOff^");
-        emojis.append(R.drawable.peace, "^peace^");
-        emojis.append(R.drawable.suspicious, "^suspicious^");
-        emojis.append(R.drawable.caffine, "^caffine^");
-        emojis.append(R.drawable.argue, "^argue^");
-        emojis.append(R.drawable.banned2, "^banned2^");
-        emojis.append(R.drawable.banned, "^banned^");
-        emojis.append(R.drawable.bath, "^bath^");
-        emojis.append(R.drawable.beg, "^beg^");
-        emojis.append(R.drawable.bluescreen, "^bluescreen^");
-        emojis.append(R.drawable.boil, "^boil^");
-        emojis.append(R.drawable.bye, "^bye^");
-        emojis.append(R.drawable.callmerip, "^callmerip^");
-        emojis.append(R.drawable.carnaval, "^carnaval^");
-        emojis.append(R.drawable.clap, "^clap^");
-        emojis.append(R.drawable.coffeepot, "^coffepot^");
-        emojis.append(R.drawable.crap, "^crap^");
-        emojis.append(R.drawable.curses, "^curses^");
-        emojis.append(R.drawable.funny, "^funny^");
-        emojis.append(R.drawable.guitar1, "^guitar^");
-        emojis.append(R.drawable.icon_kissy, "^kissy^");
-        emojis.append(R.drawable.band, "^band^");
-        emojis.append(R.drawable.ivres, "^ivres^");
-        emojis.append(R.drawable.kaloe, "^kaloe^");
-        emojis.append(R.drawable.kremala, "^kremala^");
-        emojis.append(R.drawable.moon, "^moon^");
-        emojis.append(R.drawable.mopping, "^mopping^");
-        emojis.append(R.drawable.mountza, "^mountza^");
-        emojis.append(R.drawable.pcsleep, "^pcsleep^");
-        emojis.append(R.drawable.pinokio, "^pinokio^");
-        emojis.append(R.drawable.poke, "^poke^");
-        emojis.append(R.drawable.seestars, "^seestars^");
-        emojis.append(R.drawable.sfyri, "^sfyri^");
-        emojis.append(R.drawable.spam2, "^spam^");
-        emojis.append(R.drawable.esuper, "^super^");
-        emojis.append(R.drawable.tafos, "^tafos^");
-        emojis.append(R.drawable.tomatomourh, "^tomato^");
-        emojis.append(R.drawable.ytold, "^ytold^");
-        emojis.append(R.drawable.beer2, "^beer^");
-        emojis.append(R.drawable.yu, "^yue^");
-        emojis.append(R.drawable.a_eatpaper, "^eatpaper^");
-        emojis.append(R.drawable.fritz, "^fritz^");
-        emojis.append(R.drawable.wade, "^wade^");
-        emojis.append(R.drawable.lypi, "^lypi^");
-        emojis.append(R.drawable.megashok1wq, "^aytoxeir^");
-        emojis.append(R.drawable.victory, "^victory^");
-        emojis.append(R.drawable.filarakia, "^filarakia^");
-        emojis.append(R.drawable.bonjour_97213, "^hat^");
-        emojis.append(R.drawable.curtseyqi9, "^miss^");
-        emojis.append(R.drawable.rofl, "^rolfmao^");
-        emojis.append(R.drawable.question, "^que^");
-        emojis.append(R.drawable.shifty, "^shifty^");
-        emojis.append(R.drawable.shy, "^shy^");
-        emojis.append(R.drawable.music, "^music_listen^");
-        emojis.append(R.drawable.shamed_bag, "^bagface^");
-        emojis.append(R.drawable.rotfl, "^rotate^");
-        emojis.append(R.drawable.love, "^love^");
-        emojis.append(R.drawable.speech, "^speech^");
-        emojis.append(R.drawable.facepalm, "^facepalm^");
-        emojis.append(R.drawable.shocked, "^shocked^");
-        emojis.append(R.drawable.extremely_shocked, "^ex_shocked^");
-        emojis.append(R.drawable.smurf, "^smurf^");
-
-        GridView emojiGridView = (GridView) findViewById(R.id.emoji_gridview);
+        GridView emojiGridView = findViewById(R.id.emoji_gridview);
         emojiGridView.setAdapter(new ImageKeyboardAdapter(context, getEmojiArray()));
         emojiGridView.setOnItemClickListener((parent, view, position, id) -> {
             if (inputConnection == null) return;
             String value = emojis.valueAt(position);
             inputConnection.commitText(value, 1);
         });
-        AppCompatImageButton backspaceButton = (AppCompatImageButton) findViewById(R.id.backspace_button);
+        AppCompatImageButton backspaceButton = findViewById(R.id.backspace_button);
         // backspace behavior
         final Handler handler = new Handler();
         Runnable longPressed = new Runnable() {
diff --git a/app/src/main/res/drawable/wink.gif b/app/src/main/res/drawable/emojI_wink.gif
similarity index 100%
rename from app/src/main/res/drawable/wink.gif
rename to app/src/main/res/drawable/emojI_wink.gif
diff --git a/app/src/main/res/drawable/a_eatpaper.gif b/app/src/main/res/drawable/emoji_a_eatpaper.gif
similarity index 100%
rename from app/src/main/res/drawable/a_eatpaper.gif
rename to app/src/main/res/drawable/emoji_a_eatpaper.gif
diff --git a/app/src/main/res/drawable/angry.gif b/app/src/main/res/drawable/emoji_angry.gif
similarity index 100%
rename from app/src/main/res/drawable/angry.gif
rename to app/src/main/res/drawable/emoji_angry.gif
diff --git a/app/src/main/res/drawable/angry4.gif b/app/src/main/res/drawable/emoji_angry4.gif
similarity index 100%
rename from app/src/main/res/drawable/angry4.gif
rename to app/src/main/res/drawable/emoji_angry4.gif
diff --git a/app/src/main/res/drawable/angry_hot.gif b/app/src/main/res/drawable/emoji_angry_hot.gif
similarity index 100%
rename from app/src/main/res/drawable/angry_hot.gif
rename to app/src/main/res/drawable/emoji_angry_hot.gif
diff --git a/app/src/main/res/drawable/argue.gif b/app/src/main/res/drawable/emoji_argue.gif
similarity index 100%
rename from app/src/main/res/drawable/argue.gif
rename to app/src/main/res/drawable/emoji_argue.gif
diff --git a/app/src/main/res/drawable/band.gif b/app/src/main/res/drawable/emoji_band.gif
similarity index 100%
rename from app/src/main/res/drawable/band.gif
rename to app/src/main/res/drawable/emoji_band.gif
diff --git a/app/src/main/res/drawable/bang_head.gif b/app/src/main/res/drawable/emoji_bang_head.gif
similarity index 100%
rename from app/src/main/res/drawable/bang_head.gif
rename to app/src/main/res/drawable/emoji_bang_head.gif
diff --git a/app/src/main/res/drawable/banned.gif b/app/src/main/res/drawable/emoji_banned.gif
similarity index 100%
rename from app/src/main/res/drawable/banned.gif
rename to app/src/main/res/drawable/emoji_banned.gif
diff --git a/app/src/main/res/drawable/banned2.gif b/app/src/main/res/drawable/emoji_banned2.gif
similarity index 100%
rename from app/src/main/res/drawable/banned2.gif
rename to app/src/main/res/drawable/emoji_banned2.gif
diff --git a/app/src/main/res/drawable/bath.gif b/app/src/main/res/drawable/emoji_bath.gif
similarity index 100%
rename from app/src/main/res/drawable/bath.gif
rename to app/src/main/res/drawable/emoji_bath.gif
diff --git a/app/src/main/res/drawable/beer2.gif b/app/src/main/res/drawable/emoji_beer2.gif
similarity index 100%
rename from app/src/main/res/drawable/beer2.gif
rename to app/src/main/res/drawable/emoji_beer2.gif
diff --git a/app/src/main/res/drawable/beg.gif b/app/src/main/res/drawable/emoji_beg.gif
similarity index 100%
rename from app/src/main/res/drawable/beg.gif
rename to app/src/main/res/drawable/emoji_beg.gif
diff --git a/app/src/main/res/drawable/binkybaby.gif b/app/src/main/res/drawable/emoji_binkybaby.gif
similarity index 100%
rename from app/src/main/res/drawable/binkybaby.gif
rename to app/src/main/res/drawable/emoji_binkybaby.gif
diff --git a/app/src/main/res/drawable/bluescreen.gif b/app/src/main/res/drawable/emoji_bluescreen.gif
similarity index 100%
rename from app/src/main/res/drawable/bluescreen.gif
rename to app/src/main/res/drawable/emoji_bluescreen.gif
diff --git a/app/src/main/res/drawable/boil.gif b/app/src/main/res/drawable/emoji_boil.gif
similarity index 100%
rename from app/src/main/res/drawable/boil.gif
rename to app/src/main/res/drawable/emoji_boil.gif
diff --git a/app/src/main/res/drawable/bonjour_97213.gif b/app/src/main/res/drawable/emoji_bonjour_97213.gif
similarity index 100%
rename from app/src/main/res/drawable/bonjour_97213.gif
rename to app/src/main/res/drawable/emoji_bonjour_97213.gif
diff --git a/app/src/main/res/drawable/bye.gif b/app/src/main/res/drawable/emoji_bye.gif
similarity index 100%
rename from app/src/main/res/drawable/bye.gif
rename to app/src/main/res/drawable/emoji_bye.gif
diff --git a/app/src/main/res/drawable/caffine.gif b/app/src/main/res/drawable/emoji_caffine.gif
similarity index 100%
rename from app/src/main/res/drawable/caffine.gif
rename to app/src/main/res/drawable/emoji_caffine.gif
diff --git a/app/src/main/res/drawable/callmerip.gif b/app/src/main/res/drawable/emoji_callmerip.gif
similarity index 100%
rename from app/src/main/res/drawable/callmerip.gif
rename to app/src/main/res/drawable/emoji_callmerip.gif
diff --git a/app/src/main/res/drawable/carnaval.gif b/app/src/main/res/drawable/emoji_carnaval.gif
similarity index 100%
rename from app/src/main/res/drawable/carnaval.gif
rename to app/src/main/res/drawable/emoji_carnaval.gif
diff --git a/app/src/main/res/drawable/cell_phone.gif b/app/src/main/res/drawable/emoji_cell_phone.gif
similarity index 100%
rename from app/src/main/res/drawable/cell_phone.gif
rename to app/src/main/res/drawable/emoji_cell_phone.gif
diff --git a/app/src/main/res/drawable/cheesy.gif b/app/src/main/res/drawable/emoji_cheesy.gif
similarity index 100%
rename from app/src/main/res/drawable/cheesy.gif
rename to app/src/main/res/drawable/emoji_cheesy.gif
diff --git a/app/src/main/res/drawable/clap.gif b/app/src/main/res/drawable/emoji_clap.gif
similarity index 100%
rename from app/src/main/res/drawable/clap.gif
rename to app/src/main/res/drawable/emoji_clap.gif
diff --git a/app/src/main/res/drawable/coffeepot.gif b/app/src/main/res/drawable/emoji_coffeepot.gif
similarity index 100%
rename from app/src/main/res/drawable/coffeepot.gif
rename to app/src/main/res/drawable/emoji_coffeepot.gif
diff --git a/app/src/main/res/drawable/confused.gif b/app/src/main/res/drawable/emoji_confused.gif
similarity index 100%
rename from app/src/main/res/drawable/confused.gif
rename to app/src/main/res/drawable/emoji_confused.gif
diff --git a/app/src/main/res/drawable/cool.gif b/app/src/main/res/drawable/emoji_cool.gif
similarity index 100%
rename from app/src/main/res/drawable/cool.gif
rename to app/src/main/res/drawable/emoji_cool.gif
diff --git a/app/src/main/res/drawable/cool.bmp b/app/src/main/res/drawable/emoji_cool2.bmp
similarity index 100%
rename from app/src/main/res/drawable/cool.bmp
rename to app/src/main/res/drawable/emoji_cool2.bmp
diff --git a/app/src/main/res/drawable/crap.gif b/app/src/main/res/drawable/emoji_crap.gif
similarity index 100%
rename from app/src/main/res/drawable/crap.gif
rename to app/src/main/res/drawable/emoji_crap.gif
diff --git a/app/src/main/res/drawable/crazy.jpg b/app/src/main/res/drawable/emoji_crazy.jpg
similarity index 100%
rename from app/src/main/res/drawable/crazy.jpg
rename to app/src/main/res/drawable/emoji_crazy.jpg
diff --git a/app/src/main/res/drawable/cry.gif b/app/src/main/res/drawable/emoji_cry.gif
similarity index 100%
rename from app/src/main/res/drawable/cry.gif
rename to app/src/main/res/drawable/emoji_cry.gif
diff --git a/app/src/main/res/drawable/crybaby.gif b/app/src/main/res/drawable/emoji_crybaby.gif
similarity index 100%
rename from app/src/main/res/drawable/crybaby.gif
rename to app/src/main/res/drawable/emoji_crybaby.gif
diff --git a/app/src/main/res/drawable/curses.gif b/app/src/main/res/drawable/emoji_curses.gif
similarity index 100%
rename from app/src/main/res/drawable/curses.gif
rename to app/src/main/res/drawable/emoji_curses.gif
diff --git a/app/src/main/res/drawable/curtseyqi9.gif b/app/src/main/res/drawable/emoji_curtseyqi9.gif
similarity index 100%
rename from app/src/main/res/drawable/curtseyqi9.gif
rename to app/src/main/res/drawable/emoji_curtseyqi9.gif
diff --git a/app/src/main/res/drawable/dontknow.gif b/app/src/main/res/drawable/emoji_dontknow.gif
similarity index 100%
rename from app/src/main/res/drawable/dontknow.gif
rename to app/src/main/res/drawable/emoji_dontknow.gif
diff --git a/app/src/main/res/drawable/e10_7_3e.gif b/app/src/main/res/drawable/emoji_e10_7_3e.gif
similarity index 100%
rename from app/src/main/res/drawable/e10_7_3e.gif
rename to app/src/main/res/drawable/emoji_e10_7_3e.gif
diff --git a/app/src/main/res/drawable/embarrassed.gif b/app/src/main/res/drawable/emoji_embarrassed.gif
similarity index 100%
rename from app/src/main/res/drawable/embarrassed.gif
rename to app/src/main/res/drawable/emoji_embarrassed.gif
diff --git a/app/src/main/res/drawable/esuper.gif b/app/src/main/res/drawable/emoji_esuper.gif
similarity index 100%
rename from app/src/main/res/drawable/esuper.gif
rename to app/src/main/res/drawable/emoji_esuper.gif
diff --git a/app/src/main/res/drawable/extremely_shocked.png b/app/src/main/res/drawable/emoji_extremely_shocked.png
similarity index 100%
rename from app/src/main/res/drawable/extremely_shocked.png
rename to app/src/main/res/drawable/emoji_extremely_shocked.png
diff --git a/app/src/main/res/drawable/facepalm.gif b/app/src/main/res/drawable/emoji_facepalm.gif
similarity index 100%
rename from app/src/main/res/drawable/facepalm.gif
rename to app/src/main/res/drawable/emoji_facepalm.gif
diff --git a/app/src/main/res/drawable/filarakia.gif b/app/src/main/res/drawable/emoji_filarakia.gif
similarity index 100%
rename from app/src/main/res/drawable/filarakia.gif
rename to app/src/main/res/drawable/emoji_filarakia.gif
diff --git a/app/src/main/res/drawable/foyska.gif b/app/src/main/res/drawable/emoji_foyska.gif
similarity index 100%
rename from app/src/main/res/drawable/foyska.gif
rename to app/src/main/res/drawable/emoji_foyska.gif
diff --git a/app/src/main/res/drawable/fritz.gif b/app/src/main/res/drawable/emoji_fritz.gif
similarity index 100%
rename from app/src/main/res/drawable/fritz.gif
rename to app/src/main/res/drawable/emoji_fritz.gif
diff --git a/app/src/main/res/drawable/fun.jpg b/app/src/main/res/drawable/emoji_fun.jpg
similarity index 100%
rename from app/src/main/res/drawable/fun.jpg
rename to app/src/main/res/drawable/emoji_fun.jpg
diff --git a/app/src/main/res/drawable/funny.gif b/app/src/main/res/drawable/emoji_funny.gif
similarity index 100%
rename from app/src/main/res/drawable/funny.gif
rename to app/src/main/res/drawable/emoji_funny.gif
diff --git a/app/src/main/res/drawable/grin.gif b/app/src/main/res/drawable/emoji_grin.gif
similarity index 100%
rename from app/src/main/res/drawable/grin.gif
rename to app/src/main/res/drawable/emoji_grin.gif
diff --git a/app/src/main/res/drawable/guitar1.gif b/app/src/main/res/drawable/emoji_guitar1.gif
similarity index 100%
rename from app/src/main/res/drawable/guitar1.gif
rename to app/src/main/res/drawable/emoji_guitar1.gif
diff --git a/app/src/main/res/drawable/heart.gif b/app/src/main/res/drawable/emoji_heart.gif
similarity index 100%
rename from app/src/main/res/drawable/heart.gif
rename to app/src/main/res/drawable/emoji_heart.gif
diff --git a/app/src/main/res/drawable/hello.gif b/app/src/main/res/drawable/emoji_hello.gif
similarity index 100%
rename from app/src/main/res/drawable/hello.gif
rename to app/src/main/res/drawable/emoji_hello.gif
diff --git a/app/src/main/res/drawable/huh.gif b/app/src/main/res/drawable/emoji_huh.gif
similarity index 100%
rename from app/src/main/res/drawable/huh.gif
rename to app/src/main/res/drawable/emoji_huh.gif
diff --git a/app/src/main/res/drawable/icon_kissy.gif b/app/src/main/res/drawable/emoji_icon_kissy.gif
similarity index 100%
rename from app/src/main/res/drawable/icon_kissy.gif
rename to app/src/main/res/drawable/emoji_icon_kissy.gif
diff --git a/app/src/main/res/drawable/idiot.gif b/app/src/main/res/drawable/emoji_idiot.gif
similarity index 100%
rename from app/src/main/res/drawable/idiot.gif
rename to app/src/main/res/drawable/emoji_idiot.gif
diff --git a/app/src/main/res/drawable/innocent.gif b/app/src/main/res/drawable/emoji_innocent.gif
similarity index 100%
rename from app/src/main/res/drawable/innocent.gif
rename to app/src/main/res/drawable/emoji_innocent.gif
diff --git a/app/src/main/res/drawable/ivres.gif b/app/src/main/res/drawable/emoji_ivres.gif
similarity index 100%
rename from app/src/main/res/drawable/ivres.gif
rename to app/src/main/res/drawable/emoji_ivres.gif
diff --git a/app/src/main/res/drawable/jerk.gif b/app/src/main/res/drawable/emoji_jerk.gif
similarity index 100%
rename from app/src/main/res/drawable/jerk.gif
rename to app/src/main/res/drawable/emoji_jerk.gif
diff --git a/app/src/main/res/drawable/kaloe.gif b/app/src/main/res/drawable/emoji_kaloe.gif
similarity index 100%
rename from app/src/main/res/drawable/kaloe.gif
rename to app/src/main/res/drawable/emoji_kaloe.gif
diff --git a/app/src/main/res/drawable/kiss.gif b/app/src/main/res/drawable/emoji_kiss.gif
similarity index 100%
rename from app/src/main/res/drawable/kiss.gif
rename to app/src/main/res/drawable/emoji_kiss.gif
diff --git a/app/src/main/res/drawable/knuppel.gif b/app/src/main/res/drawable/emoji_knuppel.gif
similarity index 100%
rename from app/src/main/res/drawable/knuppel.gif
rename to app/src/main/res/drawable/emoji_knuppel.gif
diff --git a/app/src/main/res/drawable/kremala.gif b/app/src/main/res/drawable/emoji_kremala.gif
similarity index 100%
rename from app/src/main/res/drawable/kremala.gif
rename to app/src/main/res/drawable/emoji_kremala.gif
diff --git a/app/src/main/res/drawable/lips_sealed.gif b/app/src/main/res/drawable/emoji_lips_sealed.gif
similarity index 100%
rename from app/src/main/res/drawable/lips_sealed.gif
rename to app/src/main/res/drawable/emoji_lips_sealed.gif
diff --git a/app/src/main/res/drawable/lipsrsealed.gif b/app/src/main/res/drawable/emoji_lipsrsealed.gif
similarity index 100%
rename from app/src/main/res/drawable/lipsrsealed.gif
rename to app/src/main/res/drawable/emoji_lipsrsealed.gif
diff --git a/app/src/main/res/drawable/locked.gif b/app/src/main/res/drawable/emoji_locked.gif
similarity index 100%
rename from app/src/main/res/drawable/locked.gif
rename to app/src/main/res/drawable/emoji_locked.gif
diff --git a/app/src/main/res/drawable/lol.jpg b/app/src/main/res/drawable/emoji_lol.jpg
similarity index 100%
rename from app/src/main/res/drawable/lol.jpg
rename to app/src/main/res/drawable/emoji_lol.jpg
diff --git a/app/src/main/res/drawable/love.jpg b/app/src/main/res/drawable/emoji_love.jpg
similarity index 100%
rename from app/src/main/res/drawable/love.jpg
rename to app/src/main/res/drawable/emoji_love.jpg
diff --git a/app/src/main/res/drawable/lypi.gif b/app/src/main/res/drawable/emoji_lypi.gif
similarity index 100%
rename from app/src/main/res/drawable/lypi.gif
rename to app/src/main/res/drawable/emoji_lypi.gif
diff --git a/app/src/main/res/drawable/mad.jpg b/app/src/main/res/drawable/emoji_mad.jpg
similarity index 100%
rename from app/src/main/res/drawable/mad.jpg
rename to app/src/main/res/drawable/emoji_mad.jpg
diff --git a/app/src/main/res/drawable/megashok1wq.gif b/app/src/main/res/drawable/emoji_megashok1wq.gif
similarity index 100%
rename from app/src/main/res/drawable/megashok1wq.gif
rename to app/src/main/res/drawable/emoji_megashok1wq.gif
diff --git a/app/src/main/res/drawable/monster.bmp b/app/src/main/res/drawable/emoji_monster.bmp
similarity index 100%
rename from app/src/main/res/drawable/monster.bmp
rename to app/src/main/res/drawable/emoji_monster.bmp
diff --git a/app/src/main/res/drawable/moon.gif b/app/src/main/res/drawable/emoji_moon.gif
similarity index 100%
rename from app/src/main/res/drawable/moon.gif
rename to app/src/main/res/drawable/emoji_moon.gif
diff --git a/app/src/main/res/drawable/mopping.gif b/app/src/main/res/drawable/emoji_mopping.gif
similarity index 100%
rename from app/src/main/res/drawable/mopping.gif
rename to app/src/main/res/drawable/emoji_mopping.gif
diff --git a/app/src/main/res/drawable/mountza.gif b/app/src/main/res/drawable/emoji_mountza.gif
similarity index 100%
rename from app/src/main/res/drawable/mountza.gif
rename to app/src/main/res/drawable/emoji_mountza.gif
diff --git a/app/src/main/res/drawable/music.gif b/app/src/main/res/drawable/emoji_music.gif
similarity index 100%
rename from app/src/main/res/drawable/music.gif
rename to app/src/main/res/drawable/emoji_music.gif
diff --git a/app/src/main/res/drawable/nista.gif b/app/src/main/res/drawable/emoji_nista.gif
similarity index 100%
rename from app/src/main/res/drawable/nista.gif
rename to app/src/main/res/drawable/emoji_nista.gif
diff --git a/app/src/main/res/drawable/noffe.gif b/app/src/main/res/drawable/emoji_noffe.gif
similarity index 100%
rename from app/src/main/res/drawable/noffe.gif
rename to app/src/main/res/drawable/emoji_noffe.gif
diff --git a/app/src/main/res/drawable/nono.gif b/app/src/main/res/drawable/emoji_nono.gif
similarity index 100%
rename from app/src/main/res/drawable/nono.gif
rename to app/src/main/res/drawable/emoji_nono.gif
diff --git a/app/src/main/res/drawable/notworthy.gif b/app/src/main/res/drawable/emoji_notworthy.gif
similarity index 100%
rename from app/src/main/res/drawable/notworthy.gif
rename to app/src/main/res/drawable/emoji_notworthy.gif
diff --git a/app/src/main/res/drawable/off_topic.gif b/app/src/main/res/drawable/emoji_off_topic.gif
similarity index 100%
rename from app/src/main/res/drawable/off_topic.gif
rename to app/src/main/res/drawable/emoji_off_topic.gif
diff --git a/app/src/main/res/drawable/pcsleep.gif b/app/src/main/res/drawable/emoji_pcsleep.gif
similarity index 100%
rename from app/src/main/res/drawable/pcsleep.gif
rename to app/src/main/res/drawable/emoji_pcsleep.gif
diff --git a/app/src/main/res/drawable/peace.gif b/app/src/main/res/drawable/emoji_peace.gif
similarity index 100%
rename from app/src/main/res/drawable/peace.gif
rename to app/src/main/res/drawable/emoji_peace.gif
diff --git a/app/src/main/res/drawable/pinokio.gif b/app/src/main/res/drawable/emoji_pinokio.gif
similarity index 100%
rename from app/src/main/res/drawable/pinokio.gif
rename to app/src/main/res/drawable/emoji_pinokio.gif
diff --git a/app/src/main/res/drawable/poke.gif b/app/src/main/res/drawable/emoji_poke.gif
similarity index 100%
rename from app/src/main/res/drawable/poke.gif
rename to app/src/main/res/drawable/emoji_poke.gif
diff --git a/app/src/main/res/drawable/police.gif b/app/src/main/res/drawable/emoji_police.gif
similarity index 100%
rename from app/src/main/res/drawable/police.gif
rename to app/src/main/res/drawable/emoji_police.gif
diff --git a/app/src/main/res/drawable/puke.gif b/app/src/main/res/drawable/emoji_puke.gif
similarity index 100%
rename from app/src/main/res/drawable/puke.gif
rename to app/src/main/res/drawable/emoji_puke.gif
diff --git a/app/src/main/res/drawable/question.gif b/app/src/main/res/drawable/emoji_question.gif
similarity index 100%
rename from app/src/main/res/drawable/question.gif
rename to app/src/main/res/drawable/emoji_question.gif
diff --git a/app/src/main/res/drawable/redface.gif b/app/src/main/res/drawable/emoji_redface.gif
similarity index 100%
rename from app/src/main/res/drawable/redface.gif
rename to app/src/main/res/drawable/emoji_redface.gif
diff --git a/app/src/main/res/drawable/rofl.gif b/app/src/main/res/drawable/emoji_rofl.gif
similarity index 100%
rename from app/src/main/res/drawable/rofl.gif
rename to app/src/main/res/drawable/emoji_rofl.gif
diff --git a/app/src/main/res/drawable/roll_over.gif b/app/src/main/res/drawable/emoji_roll_over.gif
similarity index 100%
rename from app/src/main/res/drawable/roll_over.gif
rename to app/src/main/res/drawable/emoji_roll_over.gif
diff --git a/app/src/main/res/drawable/rolleyes.gif b/app/src/main/res/drawable/emoji_rolleyes.gif
similarity index 100%
rename from app/src/main/res/drawable/rolleyes.gif
rename to app/src/main/res/drawable/emoji_rolleyes.gif
diff --git a/app/src/main/res/drawable/rotfl.gif b/app/src/main/res/drawable/emoji_rotfl.gif
similarity index 100%
rename from app/src/main/res/drawable/rotfl.gif
rename to app/src/main/res/drawable/emoji_rotfl.gif
diff --git a/app/src/main/res/drawable/sad.gif b/app/src/main/res/drawable/emoji_sad.gif
similarity index 100%
rename from app/src/main/res/drawable/sad.gif
rename to app/src/main/res/drawable/emoji_sad.gif
diff --git a/app/src/main/res/drawable/seestars.gif b/app/src/main/res/drawable/emoji_seestars.gif
similarity index 100%
rename from app/src/main/res/drawable/seestars.gif
rename to app/src/main/res/drawable/emoji_seestars.gif
diff --git a/app/src/main/res/drawable/sfyri.gif b/app/src/main/res/drawable/emoji_sfyri.gif
similarity index 100%
rename from app/src/main/res/drawable/sfyri.gif
rename to app/src/main/res/drawable/emoji_sfyri.gif
diff --git a/app/src/main/res/drawable/shamed_bag.jpg b/app/src/main/res/drawable/emoji_shamed_bag.jpg
similarity index 100%
rename from app/src/main/res/drawable/shamed_bag.jpg
rename to app/src/main/res/drawable/emoji_shamed_bag.jpg
diff --git a/app/src/main/res/drawable/shifty.gif b/app/src/main/res/drawable/emoji_shifty.gif
similarity index 100%
rename from app/src/main/res/drawable/shifty.gif
rename to app/src/main/res/drawable/emoji_shifty.gif
diff --git a/app/src/main/res/drawable/shocked.gif b/app/src/main/res/drawable/emoji_shocked.gif
similarity index 100%
rename from app/src/main/res/drawable/shocked.gif
rename to app/src/main/res/drawable/emoji_shocked.gif
diff --git a/app/src/main/res/drawable/shocked.png b/app/src/main/res/drawable/emoji_shocked2.png
similarity index 100%
rename from app/src/main/res/drawable/shocked.png
rename to app/src/main/res/drawable/emoji_shocked2.png
diff --git a/app/src/main/res/drawable/shout.gif b/app/src/main/res/drawable/emoji_shout.gif
similarity index 100%
rename from app/src/main/res/drawable/shout.gif
rename to app/src/main/res/drawable/emoji_shout.gif
diff --git a/app/src/main/res/drawable/shy.png b/app/src/main/res/drawable/emoji_shy.png
similarity index 100%
rename from app/src/main/res/drawable/shy.png
rename to app/src/main/res/drawable/emoji_shy.png
diff --git a/app/src/main/res/drawable/sleep.gif b/app/src/main/res/drawable/emoji_sleep.gif
similarity index 100%
rename from app/src/main/res/drawable/sleep.gif
rename to app/src/main/res/drawable/emoji_sleep.gif
diff --git a/app/src/main/res/drawable/slurp.gif b/app/src/main/res/drawable/emoji_slurp.gif
similarity index 100%
rename from app/src/main/res/drawable/slurp.gif
rename to app/src/main/res/drawable/emoji_slurp.gif
diff --git a/app/src/main/res/drawable/smiley.gif b/app/src/main/res/drawable/emoji_smiley.gif
similarity index 100%
rename from app/src/main/res/drawable/smiley.gif
rename to app/src/main/res/drawable/emoji_smiley.gif
diff --git a/app/src/main/res/drawable/smurf.gif b/app/src/main/res/drawable/emoji_smurf.gif
similarity index 100%
rename from app/src/main/res/drawable/smurf.gif
rename to app/src/main/res/drawable/emoji_smurf.gif
diff --git a/app/src/main/res/drawable/spam2.gif b/app/src/main/res/drawable/emoji_spam2.gif
similarity index 100%
rename from app/src/main/res/drawable/spam2.gif
rename to app/src/main/res/drawable/emoji_spam2.gif
diff --git a/app/src/main/res/drawable/speech.gif b/app/src/main/res/drawable/emoji_speech.gif
similarity index 100%
rename from app/src/main/res/drawable/speech.gif
rename to app/src/main/res/drawable/emoji_speech.gif
diff --git a/app/src/main/res/drawable/superconfused.gif b/app/src/main/res/drawable/emoji_superconfused.gif
similarity index 100%
rename from app/src/main/res/drawable/superconfused.gif
rename to app/src/main/res/drawable/emoji_superconfused.gif
diff --git a/app/src/main/res/drawable/superinnocent.gif b/app/src/main/res/drawable/emoji_superinnocent.gif
similarity index 100%
rename from app/src/main/res/drawable/superinnocent.gif
rename to app/src/main/res/drawable/emoji_superinnocent.gif
diff --git a/app/src/main/res/drawable/suspicious.gif b/app/src/main/res/drawable/emoji_suspicious.gif
similarity index 100%
rename from app/src/main/res/drawable/suspicious.gif
rename to app/src/main/res/drawable/emoji_suspicious.gif
diff --git a/app/src/main/res/drawable/tafos.gif b/app/src/main/res/drawable/emoji_tafos.gif
similarity index 100%
rename from app/src/main/res/drawable/tafos.gif
rename to app/src/main/res/drawable/emoji_tafos.gif
diff --git a/app/src/main/res/drawable/tickedoff.gif b/app/src/main/res/drawable/emoji_tickedoff.gif
similarity index 100%
rename from app/src/main/res/drawable/tickedoff.gif
rename to app/src/main/res/drawable/emoji_tickedoff.gif
diff --git a/app/src/main/res/drawable/tomatomourh.gif b/app/src/main/res/drawable/emoji_tomatomourh.gif
similarity index 100%
rename from app/src/main/res/drawable/tomatomourh.gif
rename to app/src/main/res/drawable/emoji_tomatomourh.gif
diff --git a/app/src/main/res/drawable/tongue.gif b/app/src/main/res/drawable/emoji_tongue.gif
similarity index 100%
rename from app/src/main/res/drawable/tongue.gif
rename to app/src/main/res/drawable/emoji_tongue.gif
diff --git a/app/src/main/res/drawable/undecided.gif b/app/src/main/res/drawable/emoji_undecided.gif
similarity index 100%
rename from app/src/main/res/drawable/undecided.gif
rename to app/src/main/res/drawable/emoji_undecided.gif
diff --git a/app/src/main/res/drawable/victory.gif b/app/src/main/res/drawable/emoji_victory.gif
similarity index 100%
rename from app/src/main/res/drawable/victory.gif
rename to app/src/main/res/drawable/emoji_victory.gif
diff --git a/app/src/main/res/drawable/wade.gif b/app/src/main/res/drawable/emoji_wade.gif
similarity index 100%
rename from app/src/main/res/drawable/wade.gif
rename to app/src/main/res/drawable/emoji_wade.gif
diff --git a/app/src/main/res/drawable/wav.gif b/app/src/main/res/drawable/emoji_wav.gif
similarity index 100%
rename from app/src/main/res/drawable/wav.gif
rename to app/src/main/res/drawable/emoji_wav.gif
diff --git a/app/src/main/res/drawable/ytold.gif b/app/src/main/res/drawable/emoji_ytold.gif
similarity index 100%
rename from app/src/main/res/drawable/ytold.gif
rename to app/src/main/res/drawable/emoji_ytold.gif
diff --git a/app/src/main/res/drawable/yu.gif b/app/src/main/res/drawable/emoji_yu.gif
similarity index 100%
rename from app/src/main/res/drawable/yu.gif
rename to app/src/main/res/drawable/emoji_yu.gif
diff --git a/app/src/main/res/layout/activity_test_edit_view.xml b/app/src/main/res/layout/activity_test_edit_view.xml
index 11a2e371..c5c6ad00 100644
--- a/app/src/main/res/layout/activity_test_edit_view.xml
+++ b/app/src/main/res/layout/activity_test_edit_view.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/editor_view.xml b/app/src/main/res/layout/editor_view.xml
index 8939ca35..3863f711 100644
--- a/app/src/main/res/layout/editor_view.xml
+++ b/app/src/main/res/layout/editor_view.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content" android:layout_height="wrap_content">
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
         <!--bold, italic, etc buttons-->
     </LinearLayout>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -43,8 +45,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
-            android:padding="4dp"
             android:contentDescription="@string/submit"
+            android:padding="4dp"
             app:srcCompat="@drawable/ic_send_accent_24dp" />
     </LinearLayout>
 </merge>
\ No newline at end of file
diff --git a/app/src/main/res/layout/emoji_keyboard.xml b/app/src/main/res/layout/emoji_keyboard.xml
index 6bae615d..156bfa1f 100644
--- a/app/src/main/res/layout/emoji_keyboard.xml
+++ b/app/src/main/res/layout/emoji_keyboard.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent" android:layout_height="200dp">
+    android:layout_width="match_parent"
+    android:layout_height="200dp">
 
     <!--black border line-->
     <View
-        android:background="#000000"
         android:layout_width="match_parent"
-        android:layout_height="1dp" />
+        android:layout_height="1dp"
+        android:background="#000000" />
 
     <android.support.v7.widget.AppCompatImageButton
         android:id="@+id/backspace_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:srcCompat="@drawable/ic_backspace_black_24dp"
-        android:padding="2dp"
+        android:layout_gravity="end"
         android:layout_marginEnd="8dp"
-        android:layout_gravity="end" />
+        android:padding="2dp"
+        app:srcCompat="@drawable/ic_backspace_black_24dp" />
 
     <GridView
         android:id="@+id/emoji_gridview"
         android:layout_width="match_parent"
         android:layout_height="200dp"
-        android:numColumns="auto_fit"
-        android:verticalSpacing="0dp"
+        android:gravity="center"
         android:horizontalSpacing="0dp"
+        android:numColumns="auto_fit"
         android:stretchMode="columnWidth"
-        android:gravity="center"/>
+        android:verticalSpacing="0dp" />
 </merge>
\ No newline at end of file