diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 47de6e0..cbc21bf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/Theme.AppCompat.Light.NoActionBar">
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/de/mlte/soundboard/MainActivity.kt b/app/src/main/java/de/mlte/soundboard/MainActivity.kt
index c8fd101..ebf977f 100644
--- a/app/src/main/java/de/mlte/soundboard/MainActivity.kt
+++ b/app/src/main/java/de/mlte/soundboard/MainActivity.kt
@@ -7,9 +7,11 @@ import android.media.MediaPlayer
 import android.net.Uri
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
-import android.view.LayoutInflater
+import android.support.v7.widget.Toolbar
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
 import android.widget.GridLayout
-import android.widget.TextView
 import java.io.BufferedInputStream
 import java.io.BufferedOutputStream
 
@@ -23,69 +25,94 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        duplicateButton()
+        val myToolbar = findViewById<View>(R.id.my_toolbar) as Toolbar
+        setSupportActionBar(myToolbar)
+
+
+        spawnButtons()
 
         loadPreferences()
 
     }
 
-    private fun duplicateButton() {
-        val inflater = getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
-        val parent = findViewById<GridLayout>(R.id.grid_layout)
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        val inflater = menuInflater
+        inflater.inflate(R.menu.main, menu)
+        return true
+    }
 
-        parent.columnCount = 2
+    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
+        if (item != null) {
+            when (item.itemId) {
+                R.id.action_add_new -> {
+                    val button = SoundButton(this, 0,2)
+                    addButton(button)
+                    return true
+                }
+            }
+        }
+        return super.onOptionsItemSelected(item)
+    }
 
+    private fun spawnButtons() {
+        val parent = findViewById<GridLayout>(R.id.grid_layout)
+        parent.columnCount = 2
         for (row in 0..1) {
             for (col in 0..1) {
                 val soundButton = SoundButton(this, col, row)
-                buttons.add(soundButton)
-                parent.addView(soundButton)
+                addButton(soundButton)
             }
         }
+    }
 
-        buttons.forEachIndexed { index, soundButton ->
-            soundButton.btn.setOnClickListener {
-                if (playing) {
-                    player?.let { mp ->
-                        if (mp.isPlaying) {
-                            mp.stop()
-                        }
+    private fun addButton(soundButton: SoundButton) {
+        val index = buttons.size
+        buttons.add(soundButton)
+
+        val parent = findViewById<GridLayout>(R.id.grid_layout)
+        parent.addView(soundButton)
+
+        soundButton.btn.setOnClickListener {
+            if (playing) {
+                player?.let { mp ->
+                    if (mp.isPlaying) {
+                        mp.stop()
+                    }
+                    mp.reset()
+                    mp.release()
+                }
+                for (button in buttons) {
+                    button.objectAnimator.cancel()
+                    button.progressBar.progress = 0
+                }
+                playing = false
+            } else {
+                val file = getFileStreamPath("audio" + index)
+                if (file.exists()) {
+                    val mp = MediaPlayer.create(this, Uri.fromFile(file))
+                    mp.setOnCompletionListener {
+                        soundButton.progressBar.progress = 0
                         mp.reset()
                         mp.release()
+                        playing = false
                     }
-                    for (button in buttons) {
-                        button.objectAnimator.cancel()
-                        button.progressBar.progress = 0
-                    }
-                    playing = false
-                } else {
-                    val file = getFileStreamPath("audio" + index)
-                    if (file.exists()) {
-                        val mp = MediaPlayer.create(this, Uri.fromFile(file))
-                        mp.setOnCompletionListener {
-                            soundButton.progressBar.progress = 0
-                            mp.reset()
-                            mp.release()
-                            playing = false
-                        }
-                        mp.start()
-                        player = mp
-                        playing = true
+                    mp.start()
+                    player = mp
+                    playing = true
 
-                        soundButton.progressBar.progress = 0
-                        soundButton.objectAnimator.setDuration(mp.duration.toLong()).start()
-                    }
+                    soundButton.progressBar.progress = 0
+                    soundButton.objectAnimator.setDuration(mp.duration.toLong()).start()
                 }
             }
+        }
 
-            soundButton.btn.setOnLongClickListener {
-                val intent = Intent(baseContext, EditActivity::class.java)
-                intent.putExtra("index", index)
-                intent.putExtra("caption", soundButton.btn.text)
-                startActivityForResult(intent, 1234)
+        soundButton.btn.setOnLongClickListener {
+            val intent = Intent(baseContext, EditActivity::class.java)
+            intent.putExtra("index", index)
+            intent.putExtra("caption", soundButton.btn.text)
+            startActivityForResult(intent, 1234)
 
-                true
-            }
+            true
         }
     }
 
diff --git a/app/src/main/res/drawable-hdpi/ic_add_new.png b/app/src/main/res/drawable-hdpi/ic_add_new.png
new file mode 100644
index 0000000..8517212
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_add_new.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_add_new.png b/app/src/main/res/drawable-mdpi/ic_add_new.png
new file mode 100644
index 0000000..b13ffb5
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_add_new.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_add_new.png b/app/src/main/res/drawable-xhdpi/ic_add_new.png
new file mode 100644
index 0000000..cbe4b60
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_add_new.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_add_new.png b/app/src/main/res/drawable-xxhdpi/ic_add_new.png
new file mode 100644
index 0000000..d97861c
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_add_new.png differ
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b505171..5694491 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,12 +6,21 @@
     android:layout_height="match_parent"
     tools:context="de.mlte.soundboard.MainActivity">
 
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/my_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
+        android:elevation="4dp"
+        android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
+
     <GridLayout
+        android:paddingTop="?attr/actionBarSize"
         android:id="@+id/grid_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:columnCount="1"
-        android:padding="1dp">
+        android:columnCount="1">
 
     </GridLayout>
 
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
new file mode 100644
index 0000000..0cedce6
--- /dev/null
+++ b/app/src/main/res/menu/main.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_add_new"
+        android:icon="@drawable/ic_add_new"
+        android:title="@string/action_add_new"
+        app:showAsAction="ifRoom|withText"/>
+
+</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 85ebb16..2a33093 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
 <resources>
     <string name="app_name">Soundboard</string>
+    <string name="action_add_new">Add new</string>
 </resources>