diff --git a/Source/Android/res/layout/gamelist_folderbrowser_list_item.xml b/Source/Android/res/layout/gamelist_folderbrowser_list_item.xml
index e386000c79..f7c63371a3 100644
--- a/Source/Android/res/layout/gamelist_folderbrowser_list_item.xml
+++ b/Source/Android/res/layout/gamelist_folderbrowser_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="?android:attr/listPreferredItemHeight"
     android:padding="3dp">
@@ -9,27 +10,41 @@
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
 
+        tools:src="@drawable/ic_launcher"
+
         android:layout_alignParentTop="true"
         android:layout_alignParentBottom="true"
         android:layout_marginRight="6dip"/>
 
-    <TextView
+    <!-- Properties in the 'tools' namespace are only visible in the UI editor, not at runtime. -->
+    <TextView tools:text="@string/file_size"
         android:id="@+id/ListItemSubTitle"
         android:layout_width="fill_parent"
-        android:layout_height="26dip" 
+        android:layout_height="26dip"
+
+        android:textColor="#bbbbbb"
 
         android:layout_toRightOf="@id/ListItemIcon"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
 
         android:singleLine="true"
-        android:ellipsize="marquee"/>
+        android:ellipsize="marquee"
+        />
 
-    <TextView
+    <!-- Properties in the 'tools' namespace are only visible in the UI editor, not at runtime. -->
+    <TextView tools:text="Name of Game"
         android:id="@+id/ListItemTitle"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
 
+        android:fontFamily="sans-serif-light"
+        android:textSize="22sp"
+        android:textColor="#555555"
+
+        android:singleLine="true"
+        android:ellipsize="end"
+
         android:layout_toRightOf="@id/ListItemIcon"
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
@@ -37,6 +52,6 @@
         android:layout_alignWithParentIfMissing="true"
 
         android:gravity="center_vertical"
-        android:textStyle="bold" />
+        />
 
 </RelativeLayout>
diff --git a/Source/Android/res/layout/gamelist_listview.xml b/Source/Android/res/layout/gamelist_listview.xml
index bbd1a43c07..4850de4912 100644
--- a/Source/Android/res/layout/gamelist_listview.xml
+++ b/Source/Android/res/layout/gamelist_listview.xml
@@ -1,6 +1,8 @@
 <ListView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/gamelist"
+          xmlns:tools="http://schemas.android.com/tools"
+          android:id="@+id/gamelist"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:choiceMode="singleChoice"
-    android:dividerHeight="1dp"/>
\ No newline at end of file
+    android:dividerHeight="1dp"
+    tools:listitem="@layout/gamelist_folderbrowser_list_item"/>
\ No newline at end of file
diff --git a/Source/Android/res/layout/sidemenu.xml b/Source/Android/res/layout/sidemenu.xml
index 281e9119c5..f690232e8b 100644
--- a/Source/Android/res/layout/sidemenu.xml
+++ b/Source/Android/res/layout/sidemenu.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
-    android:layout_height="match_parent"
+    android:layout_height="48dp"
     android:gravity="left"
     android:orientation="vertical" >
 
@@ -9,12 +10,11 @@
         android:id="@+id/SideMenuTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="5dip"
-        android:layout_marginTop="5dip"
+        android:layout_margin="4dp"
         android:singleLine="true"
-        android:text="@+id/TextView01"
-        android:textAppearance="?android:attr/textAppearanceLarge" 
-        android:textStyle="bold"
+        tools:text="Menu Option"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:fontFamily="sans-serif-light"
         android:textColor="#FFFFFF" />
 
 </LinearLayout>