diff --git a/.gitignore b/.gitignore
index 440403d..dbe790a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,7 @@ local.properties
 # OSX
 .DS_Store
 
-# Aneko
+# AndNeko
 play.json
 release.keystore
 secrets.tar
diff --git a/.travis.yml b/.travis.yml
index 1e41ac2..78fb78c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,10 +44,10 @@ deploy:
     secure: Y/0slou0THCqA9lQ6G7M4HbkVW+EI4ZQmfBcm3Mv+NGwSSmdFUWR9VsmHmScp2d4pxwRIm1wcAKMma7ApGDUxDx22qh1OCkN8u7hiahCjoBNWK5YL62Q0Kn6DoFJkVVGKAegVbRq3199n16jG3Z2z6Gz++NBXwwyAR2eRk8o5utVnSX1IKnfAqEJEkjxqaAjRh8hAC7B8ZSNysNdRE7bvTfBgzwpb2XUXXZLsvLuMQ1NFTmZ75BBEi/IJjtoViaTOn0UsaeA7SAY2DC6TGUOnE2F5b3uYPNgqgk57QTBzM5Zt4ETlxkz8V8tYhz4A2Azyql5aDemUDfCDFiu2umUkBrYll5km3viRhE2OExtnsyWhSX6tExObhb7z3Cw8MjumN+7LKh6wVPadCot1E9qpTd7UjPlGmyviFLlRcTAAK/3zEvJQjg1cd7mxdRlWvDzZM2pMGPtJDljV4342mARYqP3rvTCRn/0/d3i/9pZDZLujQVcqVBC1qLQkn5ssPCygyelX8CDcfBT6dpw1yfqIl9VlmtteNzqTBsWBJ5Sc4g0rYQEhxdgRraWYxeOE+63UEmJb42R3URGmXgiRe9Bv9I2R37qrhTRp2MeK3M/nUb2Bt1MtQWYsFTWt4KfWrJNBJGGo/Y7TZs/+km5mCxSYJkx/q34ZFYMAa/UfV7nF+U=
   file_glob: true
   file:
-    - "app/build/outputs/apk/Aneko-*-release.apk"
+    - "app/build/outputs/apk/AndNeko-*-release.apk"
     - "app/build/outputs/lint-results-debug.xml"
     - "app/build/outputs/mapping/release/mapping.txt"
   skip_cleanup: true
   on:
-    repo: martino2k6/aneko
+    repo: martino2k6/andneko
     branch: master
diff --git a/README.md b/README.md
index 7881509..a93bd81 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-# Android Neko, *aneko*
-[![Build Status](https://travis-ci.org/martino2k6/aneko.svg)](https://travis-ci.org/martino2k6/aneko)
+# Android Neko, *AndNeko*
+[![Build Status](https://travis-ci.org/martino2k6/andneko.svg)](https://travis-ci.org/martino2k6/andneko)
 [![Apache2 licensed](https://img.shields.io/badge/license-Apache-blue.svg)](./LICENSE.txt)
 
 TODO
diff --git a/app/build.gradle b/app/build.gradle
index 8c39e24..73da7da 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,7 +19,7 @@ apply plugin: 'com.github.triplet.play'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
-def app = "Aneko"
+def app = "AndNeko"
 def versions = new Properties();
 versions.load(file("${project.rootDir}/version.properties").newDataInputStream())
 
@@ -28,7 +28,7 @@ android {
     buildToolsVersion '24.0.1'
     
     defaultConfig {
-        applicationId 'net.orange_box.aneko'
+        applicationId 'net.orange_box.andneko'
         
         minSdkVersion 15
         targetSdkVersion 24
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index af02111..bad7c6a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@ limitations under the License.
 
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    package="net.orange_box.aneko">
+    package="net.orange_box.andneko">
     
     <!-- permissions -->
     <uses-permission android:name="android.permission.BIND_ACCESSIBILITY_SERVICE"/>
@@ -25,7 +25,7 @@ limitations under the License.
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     
     <application
-        android:icon="@drawable/awake_neko"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/Theme.App"
         android:allowBackup="true"
@@ -33,7 +33,7 @@ limitations under the License.
         
         <!-- activities -->
         <activity
-            android:name=".HomeActivity"
+            android:name="net.orange_box.andneko.HomeActivity"
             android:label="@string/title_home">
             
             <intent-filter>
@@ -44,7 +44,7 @@ limitations under the License.
         
         <!-- services -->
         <service
-            android:name=".FloatingService"
+            android:name="net.orange_box.andneko.FloatingService"
             android:label="@string/app_name"
             android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
             
diff --git a/app/src/main/java/net/orange_box/aneko/Extensions.kt b/app/src/main/java/net/orange_box/andneko/Extensions.kt
similarity index 98%
rename from app/src/main/java/net/orange_box/aneko/Extensions.kt
rename to app/src/main/java/net/orange_box/andneko/Extensions.kt
index 7cabd8b..df3802f 100644
--- a/app/src/main/java/net/orange_box/aneko/Extensions.kt
+++ b/app/src/main/java/net/orange_box/andneko/Extensions.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.orange_box.aneko
+package net.orange_box.andneko
 
 import android.content.Context
 import android.content.res.Resources
diff --git a/app/src/main/java/net/orange_box/aneko/FloatingService.kt b/app/src/main/java/net/orange_box/andneko/FloatingService.kt
similarity index 99%
rename from app/src/main/java/net/orange_box/aneko/FloatingService.kt
rename to app/src/main/java/net/orange_box/andneko/FloatingService.kt
index ad24224..d2c6063 100644
--- a/app/src/main/java/net/orange_box/aneko/FloatingService.kt
+++ b/app/src/main/java/net/orange_box/andneko/FloatingService.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.orange_box.aneko
+package net.orange_box.andneko
 
 import android.accessibilityservice.AccessibilityService
 import android.accessibilityservice.AccessibilityServiceInfo
@@ -187,7 +187,7 @@ class FloatingService :
         getService<NotificationManager>(Context.NOTIFICATION_SERVICE).notify(
                 0,
                 NotificationCompat.Builder(this)
-                        .setSmallIcon(android.R.drawable.sym_def_app_icon)
+                        .setSmallIcon(R.drawable.ic_stat_icon)
                         .setWhen(Date().time)
                         .setContentTitle(getString(R.string.notification_permissions_title))
                         .setContentText(getString(R.string.notification_permissions_content))
diff --git a/app/src/main/java/net/orange_box/aneko/HomeActivity.kt b/app/src/main/java/net/orange_box/andneko/HomeActivity.kt
similarity index 97%
rename from app/src/main/java/net/orange_box/aneko/HomeActivity.kt
rename to app/src/main/java/net/orange_box/andneko/HomeActivity.kt
index e15ad5e..ad62c03 100644
--- a/app/src/main/java/net/orange_box/aneko/HomeActivity.kt
+++ b/app/src/main/java/net/orange_box/andneko/HomeActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.orange_box.aneko
+package net.orange_box.andneko
 
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
diff --git a/app/src/main/java/net/orange_box/aneko/PathFinder.kt b/app/src/main/java/net/orange_box/andneko/PathFinder.kt
similarity index 99%
rename from app/src/main/java/net/orange_box/aneko/PathFinder.kt
rename to app/src/main/java/net/orange_box/andneko/PathFinder.kt
index f1bf256..5399857 100644
--- a/app/src/main/java/net/orange_box/aneko/PathFinder.kt
+++ b/app/src/main/java/net/orange_box/andneko/PathFinder.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.orange_box.aneko
+package net.orange_box.andneko
 
 import java.util.*
 
diff --git a/app/src/main/java/net/orange_box/aneko/PathGraph.kt b/app/src/main/java/net/orange_box/andneko/PathGraph.kt
similarity index 98%
rename from app/src/main/java/net/orange_box/aneko/PathGraph.kt
rename to app/src/main/java/net/orange_box/andneko/PathGraph.kt
index 408d19d..734e8b4 100644
--- a/app/src/main/java/net/orange_box/aneko/PathGraph.kt
+++ b/app/src/main/java/net/orange_box/andneko/PathGraph.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.orange_box.aneko
+package net.orange_box.andneko
 
 internal class PathGraph(
         private val left: Int,
diff --git a/app/src/main/java/net/orange_box/aneko/PathLocation.kt b/app/src/main/java/net/orange_box/andneko/PathLocation.kt
similarity index 95%
rename from app/src/main/java/net/orange_box/aneko/PathLocation.kt
rename to app/src/main/java/net/orange_box/andneko/PathLocation.kt
index 4fb07fa..9394f9f 100644
--- a/app/src/main/java/net/orange_box/aneko/PathLocation.kt
+++ b/app/src/main/java/net/orange_box/andneko/PathLocation.kt
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package net.orange_box.aneko
+package net.orange_box.andneko
 
 internal data class PathLocation(val x: Int, val y: Int)
diff --git a/app/src/main/java/net/orange_box/aneko/Preferences.kt b/app/src/main/java/net/orange_box/andneko/Preferences.kt
similarity index 98%
rename from app/src/main/java/net/orange_box/aneko/Preferences.kt
rename to app/src/main/java/net/orange_box/andneko/Preferences.kt
index b7bed30..26c4a7b 100644
--- a/app/src/main/java/net/orange_box/aneko/Preferences.kt
+++ b/app/src/main/java/net/orange_box/andneko/Preferences.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.orange_box.aneko
+package net.orange_box.andneko
 
 import android.content.Context
 import android.content.SharedPreferences
diff --git a/app/src/main/java/net/orange_box/aneko/ScreenMate.kt b/app/src/main/java/net/orange_box/andneko/ScreenMate.kt
similarity index 98%
rename from app/src/main/java/net/orange_box/aneko/ScreenMate.kt
rename to app/src/main/java/net/orange_box/andneko/ScreenMate.kt
index 762ad4b..e7079dc 100644
--- a/app/src/main/java/net/orange_box/aneko/ScreenMate.kt
+++ b/app/src/main/java/net/orange_box/andneko/ScreenMate.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.orange_box.aneko
+package net.orange_box.andneko
 
 import android.content.res.Resources
 import android.graphics.Bitmap
diff --git a/app/src/main/java/net/orange_box/aneko/SettingsCompat.kt b/app/src/main/java/net/orange_box/andneko/SettingsCompat.kt
similarity index 97%
rename from app/src/main/java/net/orange_box/aneko/SettingsCompat.kt
rename to app/src/main/java/net/orange_box/andneko/SettingsCompat.kt
index 2422a52..c038db6 100644
--- a/app/src/main/java/net/orange_box/aneko/SettingsCompat.kt
+++ b/app/src/main/java/net/orange_box/andneko/SettingsCompat.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.orange_box.aneko
+package net.orange_box.andneko
 
 import android.annotation.TargetApi
 import android.content.Context
diff --git a/app/src/main/java/net/orange_box/aneko/SettingsFragment.kt b/app/src/main/java/net/orange_box/andneko/SettingsFragment.kt
similarity index 99%
rename from app/src/main/java/net/orange_box/aneko/SettingsFragment.kt
rename to app/src/main/java/net/orange_box/andneko/SettingsFragment.kt
index 2ca70c5..aac3f17 100644
--- a/app/src/main/java/net/orange_box/aneko/SettingsFragment.kt
+++ b/app/src/main/java/net/orange_box/andneko/SettingsFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.orange_box.aneko
+package net.orange_box.andneko
 
 import android.app.AlertDialog
 import android.content.Context
diff --git a/app/src/main/java/net/orange_box/aneko/State.kt b/app/src/main/java/net/orange_box/andneko/State.kt
similarity index 99%
rename from app/src/main/java/net/orange_box/aneko/State.kt
rename to app/src/main/java/net/orange_box/andneko/State.kt
index c1c18f6..125ff44 100644
--- a/app/src/main/java/net/orange_box/aneko/State.kt
+++ b/app/src/main/java/net/orange_box/andneko/State.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.orange_box.aneko
+package net.orange_box.andneko
 
 import android.graphics.Point
 import android.support.annotation.DrawableRes
diff --git a/app/src/main/java/net/orange_box/aneko/StateMask.kt b/app/src/main/java/net/orange_box/andneko/StateMask.kt
similarity index 99%
rename from app/src/main/java/net/orange_box/aneko/StateMask.kt
rename to app/src/main/java/net/orange_box/andneko/StateMask.kt
index 54ff42b..f26e4ef 100644
--- a/app/src/main/java/net/orange_box/aneko/StateMask.kt
+++ b/app/src/main/java/net/orange_box/andneko/StateMask.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.orange_box.aneko
+package net.orange_box.andneko
 
 import android.support.annotation.DrawableRes
 
diff --git a/app/src/main/play/en-US/listing/fulldescription b/app/src/main/play/en-US/listing/fulldescription
index d850f56..3d0edc3 100644
--- a/app/src/main/play/en-US/listing/fulldescription
+++ b/app/src/main/play/en-US/listing/fulldescription
@@ -1,5 +1,5 @@
-Aneko is an adaptation of the popular cross-platform and open-source Neko program, which chases you around.
+AndNeko is an adaptation of the popular cross-platform and open-source Neko program, which chases you around.
 
-Aneko will act as an accessibility service, watching for items being tapped on the screen and running towards them. How the screenmate looks, runs, and acts can all be customized in the settings.
+AndNeko will act as an accessibility service, watching for items being tapped on the screen and running towards them. How the screenmate looks, runs, and acts can all be customized in the settings.
 
-The app is distributed under the Apache 2.0 License and the source can be found at https://github.com/martino2k6/aneko. Original credits go to its original creator, Kenji Gotoh, and everyone else that contributed to Neko since its inception.
+The app is distributed under the Apache 2.0 License and the source can be found at https://github.com/martino2k6/andneko. Original credits go to its original creator, Kenji Gotoh, and everyone else that contributed to Neko since its inception.
diff --git a/app/src/main/play/en-US/listing/icon/icon.png b/app/src/main/play/en-US/listing/icon/icon.png
old mode 100644
new mode 100755
index 291b4f3..286162c
Binary files a/app/src/main/play/en-US/listing/icon/icon.png and b/app/src/main/play/en-US/listing/icon/icon.png differ
diff --git a/app/src/main/play/en-US/listing/title b/app/src/main/play/en-US/listing/title
index b984c04..4be0bcd 100644
--- a/app/src/main/play/en-US/listing/title
+++ b/app/src/main/play/en-US/listing/title
@@ -1 +1 @@
-Aneko
+AndNeko
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_icon.png b/app/src/main/res/drawable-hdpi/ic_stat_icon.png
new file mode 100644
index 0000000..d71f5ba
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_stat_icon.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_icon.png b/app/src/main/res/drawable-mdpi/ic_stat_icon.png
new file mode 100644
index 0000000..9e95762
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_stat_icon.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_icon.png b/app/src/main/res/drawable-xhdpi/ic_stat_icon.png
new file mode 100644
index 0000000..12e723b
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_stat_icon.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_icon.png b/app/src/main/res/drawable-xxhdpi/ic_stat_icon.png
new file mode 100644
index 0000000..916a066
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_stat_icon.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_stat_icon.png b/app/src/main/res/drawable-xxxhdpi/ic_stat_icon.png
new file mode 100644
index 0000000..2ec243a
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_stat_icon.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..e535c0f
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..20fa646
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..34194cb
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..f7ea2ae
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..a27440c
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/values/strings-translatable.xml b/app/src/main/res/values/strings-translatable.xml
index 59f0e1b..359324a 100644
--- a/app/src/main/res/values/strings-translatable.xml
+++ b/app/src/main/res/values/strings-translatable.xml
@@ -17,8 +17,8 @@ limitations under the License.
 
 <!-- translatable literal strings -->
 <resources>
-    <string name="aneko">Aneko</string>
-    <string name="aneko_requires_to">Aneko requires to inspect the elements on the screen in order to figure out the position where the screenmate should run to.</string>
+    <string name="andneko">AndNeko</string>
+    <string name="andneko_requires_to">AndNeko requires to inspect the elements on the screen in order to figure out the position where the screenmate should run to.</string>
     
     <string name="big">Big</string>
     <string name="biggest">Biggest</string>
@@ -30,11 +30,11 @@ limitations under the License.
     <string name="change_how_smooth">Change how smooth the movement of the screenmate will be. Higher values will increase the smoothness, at the cost of increased memory consumption.</string>
     <string name="change_the_screenmate">Change the screenmate which will be chasing you on the screen.</string>
     
-    <string name="disable_aneko">Disable Aneko.</string>
+    <string name="disable_andneko">Disable AndNeko.</string>
     <string name="dog">Dog</string>
 
     <string name="enabled">Enabled</string>
-    <string name="enable_aneko">Enable Aneko.</string>
+    <string name="enable_andneko">Enable AndNeko.</string>
     
     <string name="fast">Fast</string>
     
@@ -51,9 +51,9 @@ limitations under the License.
     <string name="not_applicable_for">Not applicable for this version of Android.</string>
     
     <string name="permissions">Permissions</string>
-    <string name="permissions_are_required">Permissions are required for Aneko to draw on the screen. Tap on this preference to open the permission settings and grant them.</string>
-    <string name="permissions_for_aneko">Permissions for Aneko have been granted.</string>
-    <string name="permissions_need_to">Permissions need to be granted in order for Aneko to draw on the screen.</string>
+    <string name="permissions_are_required">Permissions are required for AndNeko to draw on the screen. Tap on this preference to open the permission settings and grant them.</string>
+    <string name="permissions_for_andneko">Permissions for AndNeko have been granted.</string>
+    <string name="permissions_need_to">Permissions need to be granted in order for AndNeko to draw on the screen.</string>
     
     <string name="sakura">Sakura</string>
     <string name="size">Size</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 32aa1f4..a3a69c4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,8 +19,8 @@ limitations under the License.
 <resources>
     <!-- generic -->
     
-    <string name="app_name">@string/aneko</string>
-    <string name="accessibility_description">@string/aneko_requires_to</string>
+    <string name="app_name">@string/andneko</string>
+    <string name="accessibility_description">@string/andneko_requires_to</string>
 
     <!-- activity titles -->
     
@@ -30,12 +30,12 @@ limitations under the License.
     
     <string name="settings_enabled">enabled</string>
     <string name="settings_enabled_title">@string/enabled</string>
-    <string name="settings_enabled_summary_on">@string/disable_aneko</string>
-    <string name="settings_enabled_summary_off">@string/enable_aneko</string>
+    <string name="settings_enabled_summary_on">@string/disable_andneko</string>
+    <string name="settings_enabled_summary_off">@string/enable_andneko</string>
     
     <string name="settings_permissions">permissions</string>
     <string name="settings_permissions_title">@string/permissions</string>
-    <string name="settings_permissions_summary_on">@string/permissions_for_aneko</string>
+    <string name="settings_permissions_summary_on">@string/permissions_for_andneko</string>
     <string name="settings_permissions_summary_off">@string/permissions_are_required</string>
     
     <string name="settings_screenmate">screenmate</string>
diff --git a/app/src/main/res/xml/accessibility.xml b/app/src/main/res/xml/accessibility.xml
index f2fe340..91d5819 100644
--- a/app/src/main/res/xml/accessibility.xml
+++ b/app/src/main/res/xml/accessibility.xml
@@ -20,5 +20,5 @@ limitations under the License.
     android:description="@string/accessibility_description"
     android:accessibilityEventTypes="typeAllMask"
     android:accessibilityFeedbackType="feedbackVisual"
-    android:settingsActivity="net.orange_box.aneko.HomeActivity"
+    android:settingsActivity="net.orange_box.andneko.HomeActivity"
     android:canRetrieveWindowContent="true"/>