diff --git a/.gitignore b/.gitignore
index de30b37..9ab267a 100755
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,9 @@ build_win/
 
 # CLion
 .idea/
+
+# Built apk
+android/app/app-release.apk
+
+# Keystore
+android/keystore.jks
diff --git a/android/app/src/main/java/game/openrayman/GameChooserActivity.java b/android/app/src/main/java/game/openrayman/GameChooserActivity.java
index 272bd09..f3b2879 100644
--- a/android/app/src/main/java/game/openrayman/GameChooserActivity.java
+++ b/android/app/src/main/java/game/openrayman/GameChooserActivity.java
@@ -22,7 +22,7 @@ public class GameChooserActivity extends AppCompatActivity {
         fab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
+                Snackbar.make(view, "TODO: this is the part when the game should be added (list of supported games or autodetection?!?)", Snackbar.LENGTH_LONG)
                         .setAction("Action", null).show();
             }
         });
diff --git a/android/app/src/main/res/drawable-hdpi/ic_add_black_24dp.png b/android/app/src/main/res/drawable-hdpi/ic_add_black_24dp.png
new file mode 100644
index 0000000..c04b523
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/ic_add_black_24dp.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/ic_add_white_24dp.png b/android/app/src/main/res/drawable-hdpi/ic_add_white_24dp.png
new file mode 100644
index 0000000..694179b
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/ic_add_white_24dp.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/ic_add_black_24dp.png b/android/app/src/main/res/drawable-mdpi/ic_add_black_24dp.png
new file mode 100644
index 0000000..23bf119
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/ic_add_black_24dp.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/ic_add_white_24dp.png b/android/app/src/main/res/drawable-mdpi/ic_add_white_24dp.png
new file mode 100644
index 0000000..3856041
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/ic_add_white_24dp.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/ic_add_black_24dp.png b/android/app/src/main/res/drawable-xhdpi/ic_add_black_24dp.png
new file mode 100644
index 0000000..3191d52
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/ic_add_black_24dp.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png b/android/app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png
new file mode 100644
index 0000000..67bb598
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png b/android/app/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png
new file mode 100644
index 0000000..a84106b
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png b/android/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png
new file mode 100644
index 0000000..0fdced8
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_add_black_24dp.png b/android/app/src/main/res/drawable-xxxhdpi/ic_add_black_24dp.png
new file mode 100644
index 0000000..3cb1092
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/ic_add_black_24dp.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png b/android/app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png
new file mode 100644
index 0000000..d64c22e
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png differ
diff --git a/android/app/src/main/res/drawable/ray_ico_def_nz.png b/android/app/src/main/res/drawable/ray_ico_def_nz.png
new file mode 100644
index 0000000..bb31d90
Binary files /dev/null and b/android/app/src/main/res/drawable/ray_ico_def_nz.png differ
diff --git a/android/app/src/main/res/drawable/ray_ico_sad_nz.png b/android/app/src/main/res/drawable/ray_ico_sad_nz.png
new file mode 100644
index 0000000..0b9c08c
Binary files /dev/null and b/android/app/src/main/res/drawable/ray_ico_sad_nz.png differ
diff --git a/android/app/src/main/res/layout/activity_game_chooser.xml b/android/app/src/main/res/layout/activity_game_chooser.xml
index f7a0d84..4614e02 100644
--- a/android/app/src/main/res/layout/activity_game_chooser.xml
+++ b/android/app/src/main/res/layout/activity_game_chooser.xml
@@ -29,6 +29,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin"
-        android:src="@android:drawable/ic_dialog_email" />
+        android:src="@drawable/ic_add_white_24dp" />
 
 </android.support.design.widget.CoordinatorLayout>
diff --git a/android/app/src/main/res/layout/content_game_chooser.xml b/android/app/src/main/res/layout/content_game_chooser.xml
index 84f8a4a..358a6a1 100644
--- a/android/app/src/main/res/layout/content_game_chooser.xml
+++ b/android/app/src/main/res/layout/content_game_chooser.xml
@@ -12,8 +12,45 @@
     tools:context="game.openrayman.GameChooserActivity"
     tools:showIn="@layout/activity_game_chooser">
 
-    <TextView
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:id="@+id/linearLayout"
+        android:weightSum="1"
+        android:layout_marginBottom="8dp">
+
+        <ImageView
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:id="@+id/imageView"
+            android:background="@drawable/ray_ico_sad_nz"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginBottom="0dp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:text="No games in library."
+            android:id="@+id/textView"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_gravity="center_vertical"
+            android:layout_marginBottom="0dp" />
+    </LinearLayout>
+
+    <ListView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Hello World!" />
+        android:id="@+id/listView"
+        android:layout_centerHorizontal="true"
+        tools:listitem="@android:layout/simple_list_item_1"
+        android:layout_below="@+id/linearLayout" />
+
 </RelativeLayout>
diff --git a/android/app/src/main/res/values-v21/styles.xml b/android/app/src/main/res/values-v21/styles.xml
index dbbdd40..89d1c85 100644
--- a/android/app/src/main/res/values-v21/styles.xml
+++ b/android/app/src/main/res/values-v21/styles.xml
@@ -1,9 +1,7 @@
 <resources>
-
     <style name="AppTheme.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
     </style>
 </resources>
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index 6cd0c39..d1720dd 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#ffcc00</color>
-    <color name="colorPrimaryDark">#e6b800</color>
-    <color name="colorAccent">#00b300</color>
+    <color name="colorPrimary">#FF9800</color>
+    <color name="colorPrimaryDark">#F57C00</color>
+    <color name="colorAccent">#FFC107</color>
 </resources>