diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 00000000..97626ba4
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 8d2df476..76e6e147 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,8 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="D:\Program Files\Android\Android Studio\gradle\gradle-2.8" />
         <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7158618b..5d199810 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -43,20 +43,4 @@
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 6564d52d..94a25f7f 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 2040fcde..f95d50b2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,6 +35,7 @@ dependencies {
     compile 'com.journeyapps:zxing-android-embedded:3.0.3@aar'
     compile 'com.google.zxing:core:3.2.1'
     compile 'commons-codec:commons-codec:1.5'
+    compile 'com.github.clans:fab:1.6.2'
 
     androidTestCompile 'com.android.support:support-annotations:23.1.1'
     androidTestCompile 'com.android.support.test:runner:0.4.1'
diff --git a/app/src/main/java/net/bierbaumer/otp_authenticator/FloatingActionMenuBehavior.java b/app/src/main/java/net/bierbaumer/otp_authenticator/FloatingActionMenuBehavior.java
new file mode 100644
index 00000000..35b6679a
--- /dev/null
+++ b/app/src/main/java/net/bierbaumer/otp_authenticator/FloatingActionMenuBehavior.java
@@ -0,0 +1,68 @@
+package net.bierbaumer.otp_authenticator;
+
+import android.content.Context;
+import android.support.design.widget.CoordinatorLayout;
+import android.support.design.widget.Snackbar;
+import android.support.v4.view.ViewCompat;
+import android.support.v4.view.ViewPropertyAnimatorListener;
+import android.util.AttributeSet;
+import android.view.View;
+
+import com.github.clans.fab.FloatingActionMenu;
+
+import java.util.List;
+
+public class FloatingActionMenuBehavior extends CoordinatorLayout.Behavior {
+    private float mTranslationY;
+
+    public FloatingActionMenuBehavior(Context context, AttributeSet attrs) {
+        super();
+    }
+
+    @Override
+    public boolean layoutDependsOn(CoordinatorLayout parent, View child, View dependency) {
+        return dependency instanceof Snackbar.SnackbarLayout;
+    }
+
+    @Override
+    public boolean onDependentViewChanged(CoordinatorLayout parent, View child, View dependency) {
+        if (child instanceof FloatingActionMenu && dependency instanceof Snackbar.SnackbarLayout) {
+            this.updateTranslation(parent, child, dependency);
+        }
+
+        return false;
+    }
+
+    private void updateTranslation(CoordinatorLayout parent, View child, View dependency) {
+        float translationY = this.getTranslationY(parent, child);
+        if (translationY != this.mTranslationY) {
+            ViewCompat.animate(child)
+                    .cancel();
+            if (Math.abs(translationY - this.mTranslationY) == (float) dependency.getHeight()) {
+                ViewCompat.animate(child)
+                        .translationY(translationY)
+                        .setListener((ViewPropertyAnimatorListener) null);
+            } else {
+                ViewCompat.setTranslationY(child, translationY);
+            }
+
+            this.mTranslationY = translationY;
+        }
+
+    }
+
+    private float getTranslationY(CoordinatorLayout parent, View child) {
+        float minOffset = 0.0F;
+        List dependencies = parent.getDependencies(child);
+        int i = 0;
+
+        for (int z = dependencies.size(); i < z; ++i) {
+            View view = (View) dependencies.get(i);
+            if (view instanceof Snackbar.SnackbarLayout && parent.doViewsOverlap(child, view)) {
+                minOffset = Math.min(minOffset, ViewCompat.getTranslationY(view) - (float) view.getHeight());
+            }
+        }
+
+        return minOffset;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/bierbaumer/otp_authenticator/MainActivity.java b/app/src/main/java/net/bierbaumer/otp_authenticator/MainActivity.java
index 0ea4f9fc..3d89cdb2 100644
--- a/app/src/main/java/net/bierbaumer/otp_authenticator/MainActivity.java
+++ b/app/src/main/java/net/bierbaumer/otp_authenticator/MainActivity.java
@@ -10,12 +10,13 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.annotation.NonNull;
-import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.view.ActionMode;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -29,15 +30,21 @@
 import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.ProgressBar;
+//import android.widget.Spinner; ToDo: Preparation to support other key types, see https://github.com/0xbb/otp-authenticator/issues/10
 
+import com.github.clans.fab.FloatingActionButton;
+import com.github.clans.fab.FloatingActionMenu;
 import com.google.zxing.client.android.Intents;
 import com.google.zxing.integration.android.IntentIntegrator;
 
+import org.apache.commons.codec.binary.Base32;
+
 import java.util.ArrayList;
 
 public class MainActivity extends AppCompatActivity implements  ActionMode.Callback {
     private ArrayList<Entry> entries;
     private EntriesAdapter adapter;
+    private FloatingActionMenu fam;
     private FloatingActionButton fab;
 
     private Handler handler;
@@ -69,7 +76,7 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String permissi
                // permission was granted
                doScanQRCode();
            } else {
-               Snackbar.make(fab, R.string.msg_camera_permission, Snackbar.LENGTH_LONG).setCallback(new Snackbar.Callback() {
+               Snackbar.make(fam, R.string.msg_camera_permission, Snackbar.LENGTH_LONG).setCallback(new Snackbar.Callback() {
                    @Override
                    public void onDismissed(Snackbar snackbar, int event) {
                        super.onDismissed(snackbar, event);
@@ -88,11 +95,11 @@ public void onDismissed(Snackbar snackbar, int event) {
 
     private Entry nextSelection = null;
     private void showNoAccount(){
-        Snackbar noAccountSnackbar = Snackbar.make(fab, R.string.no_accounts, Snackbar.LENGTH_INDEFINITE)
+        Snackbar noAccountSnackbar = Snackbar.make(fam, R.string.no_accounts, Snackbar.LENGTH_INDEFINITE)
                 .setAction(R.string.button_add, new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
-                        scanQRCode();
+                        fam.open(true);
                     }
                 });
         noAccountSnackbar.show();
@@ -107,11 +114,38 @@ protected void onCreate(Bundle savedInstanceState) {
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        fab = (FloatingActionButton) findViewById(R.id.action_scan);
+        fam = (FloatingActionMenu) findViewById(R.id.action_scan);
+        fam.setClosedOnTouchOutside(true);
+        fam.setOnMenuToggleListener(new FloatingActionMenu.OnMenuToggleListener() {
+            @Override
+            public void onMenuToggle(boolean opened) {
+                Integer icon;
+                if (opened) {
+                    icon = R.drawable.ic_image_camera_alt_135dgr;
+                    fam.setOnMenuButtonClickListener(new FloatingActionMenu.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            scanQRCode();
+                        }
+                    });
+                } else {
+                    icon = R.drawable.ic_add_white_24dp;
+                    fam.setOnMenuButtonClickListener(new FloatingActionMenu.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            fam.open(true);
+                        }
+                    });
+                }
+                fam.getMenuIconView().setImageResource(icon);
+            }
+        });
+        fab = (FloatingActionButton) findViewById(R.id.action_enter);
         fab.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View view) {
-                scanQRCode();
+            public void onClick(View v) {
+                fam.close(true);
+                addAccount();
             }
         });
 
@@ -162,6 +196,71 @@ public void run() {
         };
     }
 
+    protected void addAccount() {
+        LayoutInflater inflater = getLayoutInflater();
+        View aa_layout = inflater.inflate(R.layout.dialog_add_account, null);
+        final EditText account_label = (EditText) aa_layout.findViewById(R.id.account_label);
+        final EditText account_key = (EditText) aa_layout.findViewById(R.id.account_key);
+
+        /* ToDo: Preparation to support other key types, see https://github.com/0xbb/otp-authenticator/issues/10
+        Spinner keyType = (Spinner) addAccountLayout.findViewById(R.id.key_type);
+        ArrayAdapter keyTypeAdapter = ArrayAdapter.createFromResource(this, R.array.spinner_key_type, android.R.layout.simple_spinner_item);
+        keyTypeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        keyType.setAdapter(keyTypeAdapter);
+        */
+
+        AlertDialog.Builder aa_dialog = new AlertDialog.Builder(this);
+        aa_dialog.setTitle(R.string.add_account_title);
+        aa_dialog.setView(aa_layout);
+        aa_dialog.setNegativeButton(R.string.add_account_cancel, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                if (entries.isEmpty()) {
+                    showNoAccount();
+                }
+            }
+        });
+        aa_dialog.setPositiveButton(R.string.add_account_ok, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                try {
+                    Entry e = new Entry();
+                    e.setLabel(account_label.getText().toString());
+                    e.setSecret(new Base32().decode(account_key.getText().toString()));
+                    entries.add(e);
+                    SettingsHelper.store(getApplicationContext(), entries);
+                    adapter.notifyDataSetChanged();
+                    Snackbar.make(fam, R.string.msg_account_added, Snackbar.LENGTH_LONG).show();
+                } catch (Exception e) {
+                    Snackbar.make(fam, R.string.msg_invalid_key, Snackbar.LENGTH_LONG).setCallback(new Snackbar.Callback() {
+                        @Override
+                        public void onDismissed(Snackbar snackbar, int event) {
+                            super.onDismissed(snackbar, event);
+                            if (entries.isEmpty()) {
+                                showNoAccount();
+                            }
+                        }
+                    }).show();
+                }
+            }
+        });
+        final AlertDialog dialog = aa_dialog.create();
+        TextWatcher aa_validator = new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {}
+            @Override
+            public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {}
+            @Override
+            public void afterTextChanged(Editable s) {
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(s.length() == 0 ? false : true);
+            }
+        };
+        account_key.addTextChangedListener(aa_validator);
+        dialog.show();
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+        dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+    }
+
     @Override
     public void onResume() {
         super.onResume();
@@ -189,9 +288,9 @@ protected void onActivityResult(int requestCode, int resultCode, Intent intent)
 
                 adapter.notifyDataSetChanged();
 
-                Snackbar.make(fab, R.string.msg_account_added, Snackbar.LENGTH_LONG).show();
+                Snackbar.make(fam, R.string.msg_account_added, Snackbar.LENGTH_LONG).show();
             } catch (Exception e) {
-                Snackbar.make(fab, R.string.msg_invalid_qr_code, Snackbar.LENGTH_LONG).setCallback(new Snackbar.Callback() {
+                Snackbar.make(fam, R.string.msg_invalid_qr_code, Snackbar.LENGTH_LONG).setCallback(new Snackbar.Callback() {
                     @Override
                     public void onDismissed(Snackbar snackbar, int event) {
                         super.onDismissed(snackbar, event);
@@ -262,7 +361,7 @@ public boolean onActionItemClicked(final ActionMode actionMode, MenuItem menuIte
                 public void onClick(DialogInterface dialog, int whichButton) {
                     entries.remove(adapter.getCurrentSelection());
 
-                    Snackbar.make(fab, R.string.msg_account_removed, Snackbar.LENGTH_LONG).setCallback(new Snackbar.Callback() {
+                    Snackbar.make(fam, R.string.msg_account_removed, Snackbar.LENGTH_LONG).setCallback(new Snackbar.Callback() {
                         @Override
                         public void onDismissed(Snackbar snackbar, int event) {
                             super.onDismissed(snackbar, event);
diff --git a/app/src/main/res/drawable-hdpi/ic_hardware_keyboard.png b/app/src/main/res/drawable-hdpi/ic_hardware_keyboard.png
new file mode 100644
index 00000000..569256b5
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_hardware_keyboard.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_image_camera_alt_135dgr.png b/app/src/main/res/drawable-hdpi/ic_image_camera_alt_135dgr.png
new file mode 100644
index 00000000..a11f3e61
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_image_camera_alt_135dgr.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_hardware_keyboard.png b/app/src/main/res/drawable-mdpi/ic_hardware_keyboard.png
new file mode 100644
index 00000000..f9b62ba3
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_hardware_keyboard.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_image_camera_alt_135dgr.png b/app/src/main/res/drawable-mdpi/ic_image_camera_alt_135dgr.png
new file mode 100644
index 00000000..a11f3e61
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_image_camera_alt_135dgr.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_hardware_keyboard.png b/app/src/main/res/drawable-xhdpi/ic_hardware_keyboard.png
new file mode 100644
index 00000000..ec6f7969
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_hardware_keyboard.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_image_camera_alt_135dgr.png b/app/src/main/res/drawable-xhdpi/ic_image_camera_alt_135dgr.png
new file mode 100644
index 00000000..a11f3e61
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_image_camera_alt_135dgr.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_hardware_keyboard.png b/app/src/main/res/drawable-xxhdpi/ic_hardware_keyboard.png
new file mode 100644
index 00000000..cae86163
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_hardware_keyboard.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_image_camera_alt_135dgr.png b/app/src/main/res/drawable-xxhdpi/ic_image_camera_alt_135dgr.png
new file mode 100644
index 00000000..32c98e0a
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_image_camera_alt_135dgr.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_hardware_keyboard.png b/app/src/main/res/drawable-xxxhdpi/ic_hardware_keyboard.png
new file mode 100644
index 00000000..c54b4bd4
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_hardware_keyboard.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_image_camera_alt_135dgr.png b/app/src/main/res/drawable-xxxhdpi/ic_image_camera_alt_135dgr.png
new file mode 100644
index 00000000..2316708f
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_image_camera_alt_135dgr.png differ
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ad65da55..637cce49 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -49,12 +49,28 @@
 
     <include layout="@layout/content_main" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.github.clans.fab.FloatingActionMenu
+        xmlns:fab="http://schemas.android.com/apk/res-auto"
         android:id="@+id/action_scan"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="@dimen/fab_margin"
         android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
-        android:src="@drawable/ic_add_white_24dp"></android.support.design.widget.FloatingActionButton>
+        android:paddingBottom="10dp"
+        fab:layout_behavior="net.bierbaumer.otp_authenticator.FloatingActionMenuBehavior"
+        fab:menu_backgroundColor="#BF000000"
+        fab:menu_colorNormal="@color/colorAccent"
+        fab:menu_colorPressed="@color/colorAccent"
+        fab:menu_fab_label="@string/fam_label_scan">
+
+        <com.github.clans.fab.FloatingActionButton
+            android:id="@+id/action_enter"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_hardware_keyboard"
+            fab:fab_size="mini"
+            fab:fab_label="@string/fab_label_enter"/>
+
+    </com.github.clans.fab.FloatingActionMenu>
 
 </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/dialog_add_account.xml b/app/src/main/res/layout/dialog_add_account.xml
new file mode 100644
index 00000000..33eb1439
--- /dev/null
+++ b/app/src/main/res/layout/dialog_add_account.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="10dp">
+
+        <!--  Name -->
+        <android.support.design.widget.TextInputLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <EditText android:id="@+id/account_label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/add_account_label"/>
+        </android.support.design.widget.TextInputLayout>
+
+        <!-- Key -->
+        <android.support.design.widget.TextInputLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <EditText android:id="@+id/account_key"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="textVisiblePassword|textCapCharacters|textMultiLine"
+                android:hint="@string/add_account_key"/>
+        </android.support.design.widget.TextInputLayout>
+
+        <!-- ToDo: Preparation to support other key types, see https://github.com/0xbb/otp-authenticator/issues/10
+        <Spinner
+            android:id="@+id/key_type"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+        -->
+
+    </LinearLayout>
+</ScrollView>
\ 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 4eef8a54..6a8f707a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,4 +17,18 @@
     <string name="alert_rename">Rename</string>
     <string name="alert_remove">"Remove "</string>
     <string name="msg_camera_permission">Camera permission not granted</string>
+    <string name="fam_label_scan">Scan QR code</string>
+    <string name="fab_label_enter">Enter private key</string>
+    <!-- ToDo: Preparation to support other key types, see https://github.com/0xbb/otp-authenticator/issues/10
+    <string-array name="spinner_key_type">
+        <item>TOTP (Time based)</item>
+        <item>HOTP (Counter based)</item>
+    </string-array>
+    -->
+    <string name="add_account_title">Add account</string>
+    <string name="add_account_label">Label</string>
+    <string name="add_account_key">Key</string>
+    <string name="add_account_ok">Add</string>
+    <string name="add_account_cancel">Cancel</string>
+    <string name="msg_invalid_key">Invalid key</string>
 </resources>