diff --git a/examples/android/AndroidManifest.xml b/examples/android/AndroidManifest.xml
index 42a84eb3b..6597816c7 100644
--- a/examples/android/AndroidManifest.xml
+++ b/examples/android/AndroidManifest.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.lisp.ecl"
-      android:versionCode="1"
-      android:versionName="1.0">
-    <uses-sdk android:minSdkVersion="2" />
-    <uses-sdk android:targetSdkVersion="23" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <application android:label="@string/app_name"
-                 android:debuggable="true">
-        <activity android:name="HelloEclActivity"
-                  android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest> 
+          package="org.lisp.ecl"
+          android:versionCode="1"
+          android:versionName="1.0">
+  <uses-sdk android:minSdkVersion="2"
+            android:targetSdkVersion="23" />
+  <uses-permission android:name="android.permission.INTERNET" />
+  <application
+      android:icon="@drawable/icon"
+      android:label="@string/app_name"
+      android:debuggable="true">
+    <activity android:name="HelloEclActivity">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+  </application>
+</manifest>
diff --git a/examples/android/project.properties b/examples/android/project.properties
deleted file mode 100644
index 916037e33..000000000
--- a/examples/android/project.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-23
diff --git a/examples/android/res/drawable/icon.png b/examples/android/res/drawable/icon.png
new file mode 100644
index 000000000..70a1df2cf
Binary files /dev/null and b/examples/android/res/drawable/icon.png differ
diff --git a/examples/android/res/layout/menu.xml b/examples/android/res/layout/menu.xml
index 65b3bd681..af3c0d28f 100644
--- a/examples/android/res/layout/menu.xml
+++ b/examples/android/res/layout/menu.xml
@@ -4,5 +4,15 @@
          Set id, icon and Title for each menu item
     -->
     <item android:id="@+id/menu_uncompress"
-          android:title="Uncompress assets" /> 
+          android:title="Uncompress assets" />
+
+    <item android:id="@+id/menu_swank"
+          android:checkable="true"
+          android:title="Swank server" />
+
+    <item android:id="@+id/menu_restart"
+          android:title="Restart inferior lisp" />
+
+    <item android:id="@+id/menu_quit"
+          android:title="Quit the ECL" />
 </menu>
diff --git a/examples/android/res/values/strings.xml b/examples/android/res/values/strings.xml
index f846038c2..a4512bde4 100644
--- a/examples/android/res/values/strings.xml
+++ b/examples/android/res/values/strings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">HelloEclActivity</string>
+  <string name="app_name">Embeddable Common-Lisp</string>
 </resources>
diff --git a/examples/android/src/org/lisp/ecl/HelloEclActivity.java b/examples/android/src/org/lisp/ecl/HelloEclActivity.java
index efd745489..95086f47b 100644
--- a/examples/android/src/org/lisp/ecl/HelloEclActivity.java
+++ b/examples/android/src/org/lisp/ecl/HelloEclActivity.java
@@ -51,8 +51,6 @@ public class HelloEclActivity extends Activity
         }
 
         Log.w(TAG,"ECL starting.");
-       
-
         ecl.start(getResourcesPath());
         Log.w(TAG,"ECL Started");
 
@@ -111,7 +109,7 @@ public class HelloEclActivity extends Activity
         return true;
     }
 
-	/**
+    /**
      * Event Handling for Individual menu item selected
      * Identify single menu item by it's id
      * */