diff --git a/app/src/main/java/org/yaaic/activity/AddServerActivity.java b/app/src/main/java/org/yaaic/activity/AddServerActivity.java
index 7a82092..c4cb189 100644
--- a/app/src/main/java/org/yaaic/activity/AddServerActivity.java
+++ b/app/src/main/java/org/yaaic/activity/AddServerActivity.java
@@ -26,6 +26,7 @@ import android.os.Bundle;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarActivity;
 import android.support.v7.widget.Toolbar;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -81,22 +82,19 @@ public class AddServerActivity extends ActionBarActivity implements OnClickListe
         setContentView(R.layout.activity_add_server);
 
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
+        toolbar.addView(LayoutInflater.from(this).inflate(R.layout.item_done_discard, toolbar, false));
 
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setDisplayHomeAsUpEnabled(true);
+        setSupportActionBar(toolbar);
 
         authentication = new Authentication();
         aliases = new ArrayList<String>();
         channels = new ArrayList<String>();
         commands = new ArrayList<String>();
 
-        ((Button) findViewById(R.id.add)).setOnClickListener(this);
-        ((Button) findViewById(R.id.cancel)).setOnClickListener(this);
-        ((Button) findViewById(R.id.aliases)).setOnClickListener(this);
-        ((Button) findViewById(R.id.channels)).setOnClickListener(this);
-        ((Button) findViewById(R.id.commands)).setOnClickListener(this);
-        ((Button) findViewById(R.id.authentication)).setOnClickListener(this);
+        findViewById(R.id.aliases).setOnClickListener(this);
+        findViewById(R.id.channels).setOnClickListener(this);
+        findViewById(R.id.commands).setOnClickListener(this);
+        findViewById(R.id.authentication).setOnClickListener(this);
 
         Spinner spinner = (Spinner) findViewById(R.id.charset);
         String[] charsets = getResources().getStringArray(R.array.charsets);
@@ -162,35 +160,6 @@ public class AddServerActivity extends ActionBarActivity implements OnClickListe
         }
     }
 
-    /**
-     * On options menu requested
-     */
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu)
-    {
-        super.onCreateOptionsMenu(menu);
-
-        MenuInflater inflater = new MenuInflater(this);
-        inflater.inflate(R.menu.addserver, menu);
-
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.save:
-                save();
-                return true;
-
-            case  android.R.id.home:
-                finish();
-                return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
     /**
      * On activity result
      */
@@ -255,22 +224,18 @@ public class AddServerActivity extends ActionBarActivity implements OnClickListe
                 commandsIntent.putExtra(Extra.COMMANDS, commands);
                 startActivityForResult(commandsIntent, REQUEST_CODE_COMMANDS);
                 break;
-
-            case R.id.add:
-                save();
-                break;
-
-            case R.id.cancel:
-                setResult(RESULT_CANCELED);
-                finish();
-                break;
         }
     }
 
+    public void onCancel(View view) {
+        setResult(RESULT_CANCELED);
+        finish();
+    }
+
     /**
      * Try to save server.
      */
-    private void save() {
+    public void onSave(View view) {
         try {
             validateServer();
             validateIdentity();
diff --git a/app/src/main/res/drawable-hdpi/ic_action_discard.png b/app/src/main/res/drawable-hdpi/ic_action_discard.png
new file mode 100755
index 0000000..6fa930c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_discard.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_done.png b/app/src/main/res/drawable-hdpi/ic_action_done.png
new file mode 100755
index 0000000..8dc08bc
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_done.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_discard.png b/app/src/main/res/drawable-mdpi/ic_action_discard.png
new file mode 100755
index 0000000..b546ba6
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_action_discard.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_done.png b/app/src/main/res/drawable-mdpi/ic_action_done.png
new file mode 100755
index 0000000..3bea20e
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_action_done.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_discard.png b/app/src/main/res/drawable-xhdpi/ic_action_discard.png
new file mode 100755
index 0000000..7af1d9b
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_discard.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_done.png b/app/src/main/res/drawable-xhdpi/ic_action_done.png
new file mode 100755
index 0000000..2fe457a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_done.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_discard.png b/app/src/main/res/drawable-xxhdpi/ic_action_discard.png
new file mode 100755
index 0000000..7925f93
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_discard.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_done.png b/app/src/main/res/drawable-xxhdpi/ic_action_done.png
new file mode 100755
index 0000000..ee9a72f
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_done.png differ
diff --git a/app/src/main/res/layout/activity_add_server.xml b/app/src/main/res/layout/activity_add_server.xml
index 287cf3a..d4dd947 100644
--- a/app/src/main/res/layout/activity_add_server.xml
+++ b/app/src/main/res/layout/activity_add_server.xml
@@ -34,7 +34,8 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
         <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:scrollbarStyle="outsideInset">
+            android:scrollbarStyle="outsideInset"
+            android:padding="8dp">
 
             <LinearLayout
                 android:layout_width="fill_parent"
@@ -213,26 +214,6 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
                     android:layout_height="wrap_content"
                     android:prompt="@string/select_charset" />
                 <!-- ############################################################################ -->
-                <LinearLayout
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:paddingTop="10dp">
-
-                    <Button
-                        android:id="@+id/add"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:text="@string/server_save" />
-
-                    <Button
-                        android:id="@+id/cancel"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:text="@string/action_cancel" />
-                </LinearLayout>
             </LinearLayout>
         </ScrollView>
     </LinearLayout>
diff --git a/app/src/main/res/layout/item_done_discard.xml b/app/src/main/res/layout/item_done_discard.xml
new file mode 100644
index 0000000..4ce3d16
--- /dev/null
+++ b/app/src/main/res/layout/item_done_discard.xml
@@ -0,0 +1,56 @@
+<?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:divider="?android:attr/dividerVertical"
+    android:dividerPadding="12dp"
+    android:orientation="horizontal"
+    android:showDividers="middle" >
+
+    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/actionbar_discard"
+        style="?android:actionButtonStyle"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:clickable="true"
+        android:onClick="onCancel">
+
+        <TextView style="?android:actionBarTabTextStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:paddingRight="20dp"
+            android:drawableLeft="@drawable/ic_action_discard"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical"
+            android:textColor="@color/abc_primary_text_material_dark"
+            android:text="@string/action_cancel" />
+    </FrameLayout>
+
+    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/actionbar_done"
+        style="?android:actionButtonStyle"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:clickable="true"
+        android:onClick="onSave">
+
+        <TextView
+            style="?android:actionBarTabTextStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:drawableLeft="@drawable/ic_action_done"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical"
+            android:textColor="@color/abc_primary_text_material_dark"
+            android:paddingRight="20dp"
+            android:text="@string/action_save" />
+
+    </FrameLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/addserver.xml b/app/src/main/res/menu/addserver.xml
deleted file mode 100644
index 3aa50ad..0000000
--- a/app/src/main/res/menu/addserver.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Yaaic - Yet Another Android IRC Client
-
-Copyright 2009-2013 Sebastian Kaspari
-
-This file is part of Yaaic.
-
-Yaaic is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-Yaaic is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
--->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/save"
-        android:title="@string/server_save"
-        android:icon="@drawable/actionbar_save"
-        android:showAsAction="always" />
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 987f90c..314233b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -23,7 +23,6 @@
     <string name="server_useSSL">Use SSL</string>
     <string name="server_autoconnect">Auto connect on startup</string>
     <string name="server_channels">Channels</string>
-    <string name="server_save">Save</string>
     <string name="select_charset">Select a charset</string>
     <string name="nickname">Nickname</string>
     <string name="aliases">Aliases</string>
@@ -48,6 +47,7 @@
     <string name="preferences">Preferences</string>
     <string name="charset">Charset</string>
 
+    <string name="action_save">Save</string>
     <string name="action_remove">Remove</string>
     <string name="action_add">Add</string>
     <string name="action_ok">Ok</string>