diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 149b48ad..e5c7d47c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -30,6 +30,7 @@
     <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
     <application
         android:icon="@drawable/icon_app"
@@ -127,14 +128,14 @@
             android:name=".ui.AlarmAlertActivity"
             android:label="@string/app_name"
             android:launchMode="singleInstance"
-            android:theme="@android:style/Theme.Wallpaper.NoTitleBar" >
+            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
         </activity>
 
         <activity
             android:name="net.micode.notes.ui.NotesPreferenceActivity"
             android:label="@string/preferences_title"
             android:launchMode="singleTop"
-            android:theme="@android:style/Theme.Light" >
+            android:theme="@android:style/Theme.Holo.Light" >
         </activity>
 
         <service
diff --git a/src/net/micode/notes/ui/NoteEditActivity.java b/src/net/micode/notes/ui/NoteEditActivity.java
index 431db76a..96a9ff89 100644
--- a/src/net/micode/notes/ui/NoteEditActivity.java
+++ b/src/net/micode/notes/ui/NoteEditActivity.java
@@ -482,6 +482,9 @@ public void onBackgroundColorChanged() {
 
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
+        if (isFinishing()) {
+            return true;
+        }
         clearSettingState();
         menu.clear();
         if (mWorkingNote.getFolderId() == Notes.ID_CALL_RECORD_FOLDER) {
diff --git a/src/net/micode/notes/ui/NotesPreferenceActivity.java b/src/net/micode/notes/ui/NotesPreferenceActivity.java
index 2e7e5fd1..07c5f7ec 100644
--- a/src/net/micode/notes/ui/NotesPreferenceActivity.java
+++ b/src/net/micode/notes/ui/NotesPreferenceActivity.java
@@ -18,6 +18,7 @@
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
+import android.app.ActionBar;
 import android.app.AlertDialog;
 import android.content.BroadcastReceiver;
 import android.content.ContentValues;
@@ -34,6 +35,7 @@
 import android.text.TextUtils;
 import android.text.format.DateFormat;
 import android.view.LayoutInflater;
+import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
@@ -70,6 +72,10 @@ public class NotesPreferenceActivity extends PreferenceActivity {
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
+
+        /* using the app icon for navigation */
+        getActionBar().setDisplayHomeAsUpEnabled(true);
+
         addPreferencesFromResource(R.xml.preferences);
         mAccountCategory = (PreferenceCategory) findPreference(PREFERENCE_SYNC_ACCOUNT_KEY);
         mReceiver = new GTaskReceiver();
@@ -371,7 +377,9 @@ public void onReceive(Context context, Intent intent) {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case android.R.id.home:
-                finish();
+                Intent intent = new Intent(this, NotesListActivity.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                startActivity(intent);
                 return true;
             default:
                 return false;