diff --git a/app/src/main/java/i2p/bote/android/EmailListActivity.java b/app/src/main/java/i2p/bote/android/EmailListActivity.java
index b9ee232..374022f 100644
--- a/app/src/main/java/i2p/bote/android/EmailListActivity.java
+++ b/app/src/main/java/i2p/bote/android/EmailListActivity.java
@@ -12,11 +12,12 @@ import android.content.res.Configuration;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v4.app.ActionBarDrawerToggle;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.ActionBarDrawerToggle;
+import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -80,6 +81,10 @@ public class EmailListActivity extends ActionBarActivity implements
         InitActivities init = new InitActivities(this);
         init.initialize();
 
+        // Set the action bar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
+        setSupportActionBar(toolbar);
+
         // Initialize variables
         mHelper = new I2PAndroidHelper(this);
         mTitle = mDrawerTitle = getTitle();
@@ -101,13 +106,9 @@ public class EmailListActivity extends ActionBarActivity implements
         // Set the list's click listener
         mFolderList.setOnItemClickListener(new DrawerItemClickListener());
 
-        // Enable ActionBar app icon to behave as action to toggle nav drawer
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        getSupportActionBar().setHomeButtonEnabled(true);
-
         // Set up drawer toggle
         mDrawerToggle = new ActionBarDrawerToggle(this, mDrawerLayout,
-                R.drawable.ic_menu_white_24dp, R.string.drawer_open, R.string.drawer_close) {
+                R.string.drawer_open, R.string.drawer_close) {
             private boolean wasDragged = false;
 
             /** Called when a drawer has settled in a completely closed state. */
@@ -192,7 +193,6 @@ public class EmailListActivity extends ActionBarActivity implements
             mDrawerLayout.openDrawer(mDrawerOuter);
 
         // If first start, go to introduction and setup wizard
-        if (mSharedPrefs.getBoolean(PREF_FIRST_START, true)) {
             mSharedPrefs.edit().putBoolean(PREF_FIRST_START, false).apply();
             Intent i = new Intent(EmailListActivity.this, IntroActivity.class);
             startActivityForResult(i, SHOW_INTRODUCTION);
diff --git a/app/src/main/java/i2p/bote/android/NetworkInfoActivity.java b/app/src/main/java/i2p/bote/android/NetworkInfoActivity.java
index c0cee07..4964ba3 100644
--- a/app/src/main/java/i2p/bote/android/NetworkInfoActivity.java
+++ b/app/src/main/java/i2p/bote/android/NetworkInfoActivity.java
@@ -2,24 +2,30 @@ package i2p.bote.android;
 
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.Toolbar;
 
 public class NetworkInfoActivity extends ActionBarActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_toolbar);
         setTitle(R.string.network_status);
 
         // Initialize I2P settings
         InitActivities init = new InitActivities(this);
         init.initialize();
 
+        // Set the action bar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
+        setSupportActionBar(toolbar);
+
         // Enable ActionBar app icon to behave as action to go back
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         if (savedInstanceState == null) {
             NetworkInfoFragment f = new NetworkInfoFragment();
             getSupportFragmentManager().beginTransaction()
-                .add(android.R.id.content, f).commit();
+                .add(R.id.container, f).commit();
         }
     }
 }
diff --git a/app/src/main/java/i2p/bote/android/NewEmailActivity.java b/app/src/main/java/i2p/bote/android/NewEmailActivity.java
index 7aad558..9d8be88 100644
--- a/app/src/main/java/i2p/bote/android/NewEmailActivity.java
+++ b/app/src/main/java/i2p/bote/android/NewEmailActivity.java
@@ -2,6 +2,7 @@ package i2p.bote.android;
 
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.Toolbar;
 import android.widget.Toast;
 
 public class NewEmailActivity extends ActionBarActivity implements
@@ -9,12 +10,17 @@ public class NewEmailActivity extends ActionBarActivity implements
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_toolbar);
         setTitle(R.string.compose);
 
         // Initialize I2P settings
         InitActivities init = new InitActivities(this);
         init.initialize();
 
+        // Set the action bar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
+        setSupportActionBar(toolbar);
+
         // Enable ActionBar app icon to behave as action to go back
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
@@ -32,7 +38,7 @@ public class NewEmailActivity extends ActionBarActivity implements
             }
             f = NewEmailFragment.newInstance(quoteMsgFolder, quoteMsgId, quoteMsgType);
             getSupportFragmentManager().beginTransaction()
-                .add(android.R.id.content, f).commit();
+                .add(R.id.container, f).commit();
         }
     }
 
diff --git a/app/src/main/java/i2p/bote/android/ViewEmailActivity.java b/app/src/main/java/i2p/bote/android/ViewEmailActivity.java
index 5bcaffb..3f0fdc2 100644
--- a/app/src/main/java/i2p/bote/android/ViewEmailActivity.java
+++ b/app/src/main/java/i2p/bote/android/ViewEmailActivity.java
@@ -20,6 +20,7 @@ import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.Toolbar;
 
 public class ViewEmailActivity extends ActionBarActivity implements
         LoaderManager.LoaderCallbacks<List<String>> {
@@ -43,6 +44,10 @@ public class ViewEmailActivity extends ActionBarActivity implements
         InitActivities init = new InitActivities(this);
         init.initialize();
 
+        // Set the action bar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
+        setSupportActionBar(toolbar);
+
         // Enable ActionBar app icon to behave as action to go back
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
diff --git a/app/src/main/java/i2p/bote/android/addressbook/AddressBookActivity.java b/app/src/main/java/i2p/bote/android/addressbook/AddressBookActivity.java
index bbcba77..9b917c9 100644
--- a/app/src/main/java/i2p/bote/android/addressbook/AddressBookActivity.java
+++ b/app/src/main/java/i2p/bote/android/addressbook/AddressBookActivity.java
@@ -7,6 +7,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.Toolbar;
 
 public class AddressBookActivity extends ActionBarActivity implements
         AddressBookFragment.OnContactSelectedListener {
@@ -15,19 +16,24 @@ public class AddressBookActivity extends ActionBarActivity implements
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_toolbar);
         setTitle(R.string.address_book);
 
         // Initialize I2P settings
         InitActivities init = new InitActivities(this);
         init.initialize();
 
+        // Set the action bar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
+        setSupportActionBar(toolbar);
+
         // Enable ActionBar app icon to behave as action to go back
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         if (savedInstanceState == null) {
             AddressBookFragment f = new AddressBookFragment();
             getSupportFragmentManager().beginTransaction()
-                .add(android.R.id.content, f).commit();
+                .add(R.id.container, f).commit();
         }
     }
 
@@ -49,7 +55,7 @@ public class AddressBookActivity extends ActionBarActivity implements
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == ALTER_CONTACT_LIST) {
             if (resultCode == Activity.RESULT_OK) {
-                AddressBookFragment f = (AddressBookFragment) getSupportFragmentManager().findFragmentById(android.R.id.content);
+                AddressBookFragment f = (AddressBookFragment) getSupportFragmentManager().findFragmentById(R.id.container);
                 f.updateContactList();
             }
         } else {
diff --git a/app/src/main/java/i2p/bote/android/addressbook/EditContactActivity.java b/app/src/main/java/i2p/bote/android/addressbook/EditContactActivity.java
index 83a892d..5c3b3f8 100644
--- a/app/src/main/java/i2p/bote/android/addressbook/EditContactActivity.java
+++ b/app/src/main/java/i2p/bote/android/addressbook/EditContactActivity.java
@@ -8,18 +8,25 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.Toolbar;
 
 import i2p.bote.android.InitActivities;
+import i2p.bote.android.R;
 
 public class EditContactActivity extends ActionBarActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_toolbar);
 
         // Initialize I2P settings
         InitActivities init = new InitActivities(this);
         init.initialize();
 
+        // Set the action bar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
+        setSupportActionBar(toolbar);
+
         // Enable ActionBar app icon to behave as action to go back
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
@@ -30,7 +37,7 @@ public class EditContactActivity extends ActionBarActivity {
                 destination = args.getString(EditContactFragment.CONTACT_DESTINATION);
             EditContactFragment f = EditContactFragment.newInstance(destination);
             getSupportFragmentManager().beginTransaction()
-                    .add(android.R.id.content, f).commit();
+                    .add(R.id.container, f).commit();
         }
     }
 
@@ -73,6 +80,6 @@ public class EditContactActivity extends ActionBarActivity {
         EditContactFragment f = EditContactFragment.newInstance(
                 name, destination);
         getSupportFragmentManager().beginTransaction()
-                .replace(android.R.id.content, f).commit();
+                .replace(R.id.container, f).commit();
     }
 }
diff --git a/app/src/main/java/i2p/bote/android/addressbook/ViewContactActivity.java b/app/src/main/java/i2p/bote/android/addressbook/ViewContactActivity.java
index a5e0f57..7a9f8e6 100644
--- a/app/src/main/java/i2p/bote/android/addressbook/ViewContactActivity.java
+++ b/app/src/main/java/i2p/bote/android/addressbook/ViewContactActivity.java
@@ -1,17 +1,16 @@
 package i2p.bote.android.addressbook;
 
 import android.annotation.SuppressLint;
-import android.content.Intent;
 import android.nfc.NdefMessage;
-import android.nfc.NdefRecord;
 import android.nfc.NfcAdapter;
 import android.nfc.NfcEvent;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Parcelable;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.Toolbar;
 
 import i2p.bote.android.InitActivities;
+import i2p.bote.android.R;
 
 public class ViewContactActivity extends ActionBarActivity {
     NfcAdapter mNfcAdapter;
@@ -20,11 +19,16 @@ public class ViewContactActivity extends ActionBarActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_toolbar);
 
         // Initialize I2P settings
         InitActivities init = new InitActivities(this);
         init.initialize();
 
+        // Set the action bar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
+        setSupportActionBar(toolbar);
+
         // Enable ActionBar app icon to behave as action to go back
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
@@ -35,7 +39,7 @@ public class ViewContactActivity extends ActionBarActivity {
                 destination = args.getString(ViewContactFragment.CONTACT_DESTINATION);
             ViewContactFragment f = ViewContactFragment.newInstance(destination);
             getSupportFragmentManager().beginTransaction()
-                    .add(android.R.id.content, f).commit();
+                    .add(R.id.container, f).commit();
         }
 
         // NFC send only works on API 10+
@@ -65,7 +69,7 @@ public class ViewContactActivity extends ActionBarActivity {
 
     private NdefMessage getNdefMessage() {
         ViewContactFragment f = (ViewContactFragment) getSupportFragmentManager()
-                .findFragmentById(android.R.id.content);
+                .findFragmentById(R.id.container);
         return f.createNdefMessage();
     }
 
diff --git a/app/src/main/java/i2p/bote/android/config/EditIdentityActivity.java b/app/src/main/java/i2p/bote/android/config/EditIdentityActivity.java
index a28910a..0eb6603 100644
--- a/app/src/main/java/i2p/bote/android/config/EditIdentityActivity.java
+++ b/app/src/main/java/i2p/bote/android/config/EditIdentityActivity.java
@@ -4,6 +4,7 @@ import i2p.bote.android.InitActivities;
 import i2p.bote.android.R;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.Toolbar;
 import android.widget.Toast;
 
 public class EditIdentityActivity extends ActionBarActivity implements
@@ -17,6 +18,10 @@ public class EditIdentityActivity extends ActionBarActivity implements
         InitActivities init = new InitActivities(this);
         init.initialize();
 
+        // Set the action bar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
+        setSupportActionBar(toolbar);
+
         // Enable ActionBar app icon to behave as action to go back
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
diff --git a/app/src/main/java/i2p/bote/android/config/IdentityShipActivity.java b/app/src/main/java/i2p/bote/android/config/IdentityShipActivity.java
index 0532267..0db79a1 100644
--- a/app/src/main/java/i2p/bote/android/config/IdentityShipActivity.java
+++ b/app/src/main/java/i2p/bote/android/config/IdentityShipActivity.java
@@ -2,6 +2,7 @@ package i2p.bote.android.config;
 
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.Toolbar;
 import android.widget.Toast;
 
 import i2p.bote.android.InitActivities;
@@ -22,6 +23,10 @@ public class IdentityShipActivity extends ActionBarActivity implements
         InitActivities init = new InitActivities(this);
         init.initialize();
 
+        // Set the action bar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
+        setSupportActionBar(toolbar);
+
         // Enable ActionBar app icon to behave as action to go back
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
diff --git a/app/src/main/java/i2p/bote/android/config/SetPasswordActivity.java b/app/src/main/java/i2p/bote/android/config/SetPasswordActivity.java
index 5379a16..db6bca6 100644
--- a/app/src/main/java/i2p/bote/android/config/SetPasswordActivity.java
+++ b/app/src/main/java/i2p/bote/android/config/SetPasswordActivity.java
@@ -4,6 +4,7 @@ import i2p.bote.android.InitActivities;
 import i2p.bote.android.R;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.Toolbar;
 import android.widget.Toast;
 
 public class SetPasswordActivity extends ActionBarActivity implements
@@ -18,6 +19,10 @@ public class SetPasswordActivity extends ActionBarActivity implements
         InitActivities init = new InitActivities(this);
         init.initialize();
 
+        // Set the action bar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
+        setSupportActionBar(toolbar);
+
         // Enable ActionBar app icon to behave as action to go back
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
     }
diff --git a/app/src/main/java/i2p/bote/android/config/ViewIdentityActivity.java b/app/src/main/java/i2p/bote/android/config/ViewIdentityActivity.java
index 534e4b5..ead8d97 100644
--- a/app/src/main/java/i2p/bote/android/config/ViewIdentityActivity.java
+++ b/app/src/main/java/i2p/bote/android/config/ViewIdentityActivity.java
@@ -7,8 +7,10 @@ import android.nfc.NfcEvent;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.Toolbar;
 
 import i2p.bote.android.InitActivities;
+import i2p.bote.android.R;
 
 public class ViewIdentityActivity extends ActionBarActivity {
     NfcAdapter mNfcAdapter;
@@ -17,11 +19,16 @@ public class ViewIdentityActivity extends ActionBarActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_toolbar);
 
         // Initialize I2P settings
         InitActivities init = new InitActivities(this);
         init.initialize();
 
+        // Set the action bar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
+        setSupportActionBar(toolbar);
+
         // Enable ActionBar app icon to behave as action to go back
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
@@ -32,7 +39,7 @@ public class ViewIdentityActivity extends ActionBarActivity {
                 key = args.getString(ViewIdentityFragment.IDENTITY_KEY);
             ViewIdentityFragment f = ViewIdentityFragment.newInstance(key);
             getSupportFragmentManager().beginTransaction()
-                .add(android.R.id.content, f).commit();
+                .add(R.id.container, f).commit();
         }
 
         // NFC send only works on API 10+
@@ -62,7 +69,7 @@ public class ViewIdentityActivity extends ActionBarActivity {
 
     private NdefMessage getNdefMessage() {
         ViewIdentityFragment f = (ViewIdentityFragment) getSupportFragmentManager()
-                .findFragmentById(android.R.id.content);
+                .findFragmentById(R.id.container);
         return f.createNdefMessage();
     }
 
diff --git a/app/src/main/java/i2p/bote/android/intro/IntroActivity.java b/app/src/main/java/i2p/bote/android/intro/IntroActivity.java
index 243efe5..bccbbb1 100644
--- a/app/src/main/java/i2p/bote/android/intro/IntroActivity.java
+++ b/app/src/main/java/i2p/bote/android/intro/IntroActivity.java
@@ -39,9 +39,6 @@ public class IntroActivity extends ActionBarActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_intro);
 
-        // Take up the entire screen.
-        getSupportActionBar().hide();
-
         // Create the sections adapter.
         mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
 
diff --git a/app/src/main/java/i2p/bote/android/intro/SetupActivity.java b/app/src/main/java/i2p/bote/android/intro/SetupActivity.java
index e944e5e..581aaaa 100644
--- a/app/src/main/java/i2p/bote/android/intro/SetupActivity.java
+++ b/app/src/main/java/i2p/bote/android/intro/SetupActivity.java
@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -18,7 +19,11 @@ public class SetupActivity extends ActionBarActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_setup);
+        setContentView(R.layout.activity_toolbar);
+
+        // Set the action bar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
+        setSupportActionBar(toolbar);
 
         // If a user has chosen to enter the setup wizard, don't let them
         // accidentally exit it early.
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_menu_white_24dp.png
deleted file mode 100644
index 2e9f915..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_menu_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_menu_white_24dp.png
deleted file mode 100644
index 42482eb..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_menu_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png
deleted file mode 100644
index ceadb18..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png
deleted file mode 100644
index 22c82ea..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/layout/activity_edit_identity.xml b/app/src/main/res/layout/activity_edit_identity.xml
index 2f6ceea..31b1793 100644
--- a/app/src/main/res/layout/activity_edit_identity.xml
+++ b/app/src/main/res/layout/activity_edit_identity.xml
@@ -1,23 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
-    <LinearLayout
+    <android.support.v7.widget.Toolbar xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/main_toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical" >
+        android:background="?attr/colorPrimary"
+        android:minHeight="?attr/actionBarSize"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
 
-        <FrameLayout
-            android:id="@+id/edit_identity_frag"
+    <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
-        <FrameLayout
-            android:id="@+id/identity_waiter_frag"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-    </LinearLayout>
+            <FrameLayout
+                android:id="@+id/edit_identity_frag"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
 
-</ScrollView>
\ No newline at end of file
+            <FrameLayout
+                android:id="@+id/identity_waiter_frag"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+
+    </ScrollView>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_identity_ship.xml b/app/src/main/res/layout/activity_identity_ship.xml
index 76533de..1b89a68 100644
--- a/app/src/main/res/layout/activity_identity_ship.xml
+++ b/app/src/main/res/layout/activity_identity_ship.xml
@@ -1,23 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
-    <LinearLayout
+    <android.support.v7.widget.Toolbar xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/main_toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical" >
+        android:background="?attr/colorPrimary"
+        android:minHeight="?attr/actionBarSize"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
 
-        <FrameLayout
-            android:id="@+id/identity_ship_frag"
+    <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
-        <FrameLayout
-            android:id="@+id/waiter_frag"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-    </LinearLayout>
+            <FrameLayout
+                android:id="@+id/identity_ship_frag"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
 
-</ScrollView>
\ No newline at end of file
+            <FrameLayout
+                android:id="@+id/waiter_frag"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+
+    </ScrollView>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5cb0159..30de58a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,83 +1,98 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".EmailListActivity">
+    android:orientation="vertical">
 
-    <!-- The mail list view -->
-    <FrameLayout
-        android:id="@+id/list_fragment"
+    <android.support.v7.widget.Toolbar xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/main_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="wrap_content"
+        android:background="?attr/colorPrimary"
+        android:minHeight="?attr/actionBarSize"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
 
-    <!-- The navigation drawer -->
-    <RelativeLayout
-        android:id="@+id/drawer_outer"
-        android:layout_width="240dp"
+    <android.support.v4.widget.DrawerLayout
+        android:id="@+id/drawer_layout"
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:background="@color/background_floating_material_light">
+        tools:context=".EmailListActivity">
 
-        <ListView
-            android:id="@+id/drawer"
+        <!-- The mail list view -->
+        <FrameLayout
+            android:id="@+id/list_fragment"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_above="@+id/fixed_actions"
-            android:layout_alignParentTop="true"
-            android:choiceMode="singleChoice"
-            android:divider="@android:color/transparent"
-            android:dividerHeight="0dp" />
+            android:layout_height="match_parent" />
 
-        <LinearLayout
-            android:id="@+id/fixed_actions"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:orientation="vertical">
+        <!-- The navigation drawer -->
+        <RelativeLayout
+            android:id="@+id/drawer_outer"
+            android:layout_width="240dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="start"
+            android:background="@color/background_floating_material_light">
 
-            <FrameLayout
-                android:id="@+id/address_book"
+            <ListView
+                android:id="@+id/drawer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/folder_activated_background">
+                android:layout_above="@+id/fixed_actions"
+                android:layout_alignParentTop="true"
+                android:choiceMode="singleChoice"
+                android:divider="@android:color/transparent"
+                android:dividerHeight="0dp" />
 
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/nav_entry_height"
-                    android:gravity="center_vertical"
-                    android:paddingEnd="@dimen/nav_horizontal_margin"
-                    android:paddingLeft="@dimen/nav_horizontal_margin"
-                    android:paddingRight="@dimen/nav_horizontal_margin"
-                    android:paddingStart="@dimen/nav_horizontal_margin"
-                    android:text="@string/address_book"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
-            </FrameLayout>
-
-            <FrameLayout
-                android:id="@+id/network_status"
+            <LinearLayout
+                android:id="@+id/fixed_actions"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/folder_activated_background">
+                android:layout_alignParentBottom="true"
+                android:orientation="vertical">
 
-                <TextView
-                    android:id="@+id/network_status_text"
+                <FrameLayout
+                    android:id="@+id/address_book"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/nav_entry_height"
-                    android:drawableLeft="@android:drawable/presence_offline"
-                    android:drawablePadding="10dp"
-                    android:drawableStart="@android:drawable/presence_offline"
-                    android:gravity="center_vertical"
-                    android:paddingEnd="@dimen/nav_horizontal_margin"
-                    android:paddingLeft="@dimen/nav_horizontal_margin"
-                    android:paddingRight="@dimen/nav_horizontal_margin"
-                    android:paddingStart="@dimen/nav_horizontal_margin"
-                    android:text="@string/network_status"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
-            </FrameLayout>
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/folder_activated_background">
 
-        </LinearLayout>
-    </RelativeLayout>
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/nav_entry_height"
+                        android:gravity="center_vertical"
+                        android:paddingEnd="@dimen/nav_horizontal_margin"
+                        android:paddingLeft="@dimen/nav_horizontal_margin"
+                        android:paddingRight="@dimen/nav_horizontal_margin"
+                        android:paddingStart="@dimen/nav_horizontal_margin"
+                        android:text="@string/address_book"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+                </FrameLayout>
 
-</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
+                <FrameLayout
+                    android:id="@+id/network_status"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/folder_activated_background">
+
+                    <TextView
+                        android:id="@+id/network_status_text"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/nav_entry_height"
+                        android:drawableLeft="@android:drawable/presence_offline"
+                        android:drawablePadding="10dp"
+                        android:drawableStart="@android:drawable/presence_offline"
+                        android:gravity="center_vertical"
+                        android:paddingEnd="@dimen/nav_horizontal_margin"
+                        android:paddingLeft="@dimen/nav_horizontal_margin"
+                        android:paddingRight="@dimen/nav_horizontal_margin"
+                        android:paddingStart="@dimen/nav_horizontal_margin"
+                        android:text="@string/network_status"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+                </FrameLayout>
+
+            </LinearLayout>
+        </RelativeLayout>
+
+    </android.support.v4.widget.DrawerLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_set_password.xml b/app/src/main/res/layout/activity_set_password.xml
index 10ca354..9bca5e8 100644
--- a/app/src/main/res/layout/activity_set_password.xml
+++ b/app/src/main/res/layout/activity_set_password.xml
@@ -1,26 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
-    <LinearLayout
+    <android.support.v7.widget.Toolbar xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/main_toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical" >
+        android:background="?attr/colorPrimary"
+        android:minHeight="?attr/actionBarSize"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
 
-        <fragment
-            android:id="@+id/set_password_frag"
-            android:name="i2p.bote.android.config.SetPasswordFragment"
+    <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            tools:layout="@layout/fragment_set_password" >
-        </fragment>
+            android:orientation="vertical">
 
-        <FrameLayout
-            android:id="@+id/password_waiter_frag"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-    </LinearLayout>
+            <fragment
+                android:id="@+id/set_password_frag"
+                android:name="i2p.bote.android.config.SetPasswordFragment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:layout="@layout/fragment_set_password" />
 
-</ScrollView>
\ No newline at end of file
+            <FrameLayout
+                android:id="@+id/password_waiter_frag"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+
+    </ScrollView>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_setup.xml b/app/src/main/res/layout/activity_setup.xml
deleted file mode 100644
index 008ae3d..0000000
--- a/app/src/main/res/layout/activity_setup.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="i2p.bote.android.intro.SetupActivity"
-    tools:ignore="MergeRootFrame" />
diff --git a/app/src/main/res/layout/activity_toolbar.xml b/app/src/main/res/layout/activity_toolbar.xml
new file mode 100644
index 0000000..35a863d
--- /dev/null
+++ b/app/src/main/res/layout/activity_toolbar.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <android.support.v7.widget.Toolbar xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/main_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/colorPrimary"
+        android:minHeight="?attr/actionBarSize"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+    <FrameLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_view_email.xml b/app/src/main/res/layout/activity_view_email.xml
index 80a99db..56e68d6 100644
--- a/app/src/main/res/layout/activity_view_email.xml
+++ b/app/src/main/res/layout/activity_view_email.xml
@@ -1,6 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.view.ViewPager
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/pager"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" />
\ No newline at end of file
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <android.support.v7.widget.Toolbar xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/main_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/colorPrimary"
+        android:minHeight="?attr/actionBarSize"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1059bbf..d1971c0 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Theme.Bote" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="Theme.Bote" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Here we setting appcompat’s actionBarStyle -->
         <!--<item name="actionBarStyle">@style/MyActionBarStyle</item>-->