diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index e5fc62a3b..07481a436 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.habitrpg.android.habitica"
     android:versionCode="24"
     android:versionName="0.0.24"
-    android:screenOrientation="portrait" >
+    android:screenOrientation="portrait">
 
     <uses-sdk
         android:minSdkVersion="15"
@@ -21,7 +22,8 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:replace="android:icon">
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 37b056e87..d7a717d5d 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -26,6 +26,11 @@ repositories {
         url "http://dl.bintray.com/florent37/maven"
     }
 
+    // Emojis
+    maven {
+        url 'https://github.com/rockerhieu/mvn-repo/raw/master/'
+    }
+
     maven {
         url "https://jitpack.io"
     }
@@ -61,6 +66,9 @@ dependencies {
     // Icons
     compile 'com.mikepenz:fontawesome-typeface:4.4.0.1@aar'
 
+    // Emojis
+    compile 'com.rockerhieu.emojicon:library:1.0'
+
     // Changelog Fragment, minSDK 17
     compile 'com.github.porokoro.paperboy:paperboy:2.1.0'