diff --git a/app/src/main/java/i2p/bote/android/addressbook/AddressBookFragment.java b/app/src/main/java/i2p/bote/android/addressbook/AddressBookFragment.java
index 1fb712c..be3ac83 100644
--- a/app/src/main/java/i2p/bote/android/addressbook/AddressBookFragment.java
+++ b/app/src/main/java/i2p/bote/android/addressbook/AddressBookFragment.java
@@ -6,10 +6,13 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageButton;
 import android.widget.ListView;
 
 import java.util.SortedSet;
@@ -18,7 +21,6 @@ import i2p.bote.I2PBote;
 import i2p.bote.android.R;
 import i2p.bote.android.util.AuthenticatedListFragment;
 import i2p.bote.android.util.BetterAsyncTaskLoader;
-import i2p.bote.android.util.BoteHelper;
 import i2p.bote.fileencryption.PasswordException;
 import i2p.bote.packet.dht.Contact;
 
@@ -27,7 +29,7 @@ public class AddressBookFragment extends AuthenticatedListFragment implements
     OnContactSelectedListener mCallback;
     private ContactAdapter mAdapter;
 
-    private MenuItem mNewContact;
+    private View mPromotedActions;
 
     // Container Activity must implement this interface
     public interface OnContactSelectedListener {
@@ -51,9 +53,32 @@ public class AddressBookFragment extends AuthenticatedListFragment implements
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        // Only so we can show/hide the FAM
         setHasOptionsMenu(true);
     }
 
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        // Create the list fragment's content view by calling the super method
+        final View listFragmentView = super.onCreateView(inflater, container, savedInstanceState);
+
+        View v = inflater.inflate(R.layout.fragment_list_contacts, container, false);
+        FrameLayout listContainer = (FrameLayout) v.findViewById(R.id.list_container);
+        listContainer.addView(listFragmentView);
+
+        mPromotedActions = v.findViewById(R.id.promoted_actions);
+
+        ImageButton b = (ImageButton) v.findViewById(R.id.action_new_contact);
+        b.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                startNewContact();
+            }
+        });
+
+        return v;
+    }
+
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
@@ -81,39 +106,13 @@ public class AddressBookFragment extends AuthenticatedListFragment implements
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
-        inflater.inflate(R.menu.address_book_list, menu);
-        mNewContact = menu.findItem(R.id.action_new_contact);
     }
 
     @Override
     public void onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
-        mNewContact.setVisible(!I2PBote.getInstance().isPasswordRequired());
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-        case R.id.action_new_contact:
-            if (I2PBote.getInstance().isPasswordRequired()) {
-                BoteHelper.requestPassword(getActivity(), new BoteHelper.RequestPasswordListener() {
-                    @Override
-                    public void onPasswordVerified() {
-                        startNewContact();
-                    }
-
-                    @Override
-                    public void onPasswordCanceled() {
-                    }
-                });
-            } else {
-                startNewContact();
-            }
-            return true;
-
-        default:
-            return super.onOptionsItemSelected(item);
-        }
+        boolean passwordRequired = I2PBote.getInstance().isPasswordRequired();
+        mPromotedActions.setVisibility(passwordRequired ? View.GONE : View.VISIBLE);
     }
 
     private void startNewContact() {
diff --git a/app/src/main/res/layout/fragment_list_contacts.xml b/app/src/main/res/layout/fragment_list_contacts.xml
new file mode 100644
index 0000000..745d2c6
--- /dev/null
+++ b/app/src/main/res/layout/fragment_list_contacts.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout
+        android:id="@+id/list_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <net.i2p.android.ext.floatingactionbutton.FloatingActionsMenu
+        android:id="@+id/promoted_actions"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginBottom="@dimen/listitem_horizontal_margin"
+        android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+        android:layout_marginRight="@dimen/listitem_horizontal_margin"
+        app:fab_addButtonColorNormal="@color/accent"
+        app:fab_addButtonColorPressed="@color/accent_dark">
+
+        <net.i2p.android.ext.floatingactionbutton.FloatingActionButton
+            android:id="@+id/action_new_contact"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:fab_colorNormal="@color/accent"
+            app:fab_colorPressed="@color/accent_dark"
+            app:fab_icon="@drawable/ic_person_add_white_24dp"/>
+    </net.i2p.android.ext.floatingactionbutton.FloatingActionsMenu>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/address_book_list.xml b/app/src/main/res/menu/address_book_list.xml
index b450a23..1aea760 100644
--- a/app/src/main/res/menu/address_book_list.xml
+++ b/app/src/main/res/menu/address_book_list.xml
@@ -2,10 +2,4 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:i2pandroid="http://schemas.android.com/apk/res-auto" >
 
-    <item
-        android:id="@+id/action_new_contact"
-        android:icon="@drawable/ic_person_add_white_24dp"
-        android:title="@string/action_new_contact"
-        i2pandroid:showAsAction="ifRoom"/>
-
 </menu>
\ No newline at end of file