diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index bcaa24d93..2371e9975 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -375,11 +375,6 @@
             android:name="com.todoroo.astrid.actfm.TagSettingsActivity"
             android:windowSoftInputMode="stateHidden" />
 
-        <activity
-            android:name="com.todoroo.astrid.actfm.TagSettingsActivityTablet"
-            android:windowSoftInputMode="stateHidden"
-            android:theme="@style/Tasks.Dialog" />
-
         <!-- gtasks -->
         <activity
             android:name="com.todoroo.astrid.gtasks.auth.GtasksLoginActivity"
diff --git a/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java b/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java
index 5c543d00a..4b5af4c3c 100644
--- a/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java
+++ b/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java
@@ -9,6 +9,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
+import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -50,6 +51,13 @@ public class TagSettingsActivity extends InjectingAppCompatActivity {
         preferences.applyThemeAndStatusBarColor();
         setContentView(R.layout.tag_settings_activity);
 
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        ActionBar supportActionBar = getSupportActionBar();
+        if (supportActionBar != null) {
+            supportActionBar.setDisplayHomeAsUpEnabled(true);
+        }
+
         tagData = getIntent().getParcelableExtra(TagViewFragment.EXTRA_TAG_DATA);
         if (tagData == null) {
             isNewTag = true;
diff --git a/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivityTablet.java b/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivityTablet.java
deleted file mode 100644
index 36f23768f..000000000
--- a/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivityTablet.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Copyright (c) 2012 Todoroo Inc
- *
- * See the file "LICENSE" for the full license governing this code.
- */
-package com.todoroo.astrid.actfm;
-
-public class TagSettingsActivityTablet extends TagSettingsActivity {
-    /**
-     * This class exists for the sole purpose of being declared separately in the manifest
-     * so that we don't get crazy bugs with it being Dialog Theme on tablets and normal theme
-     * on phones.
-     */
-}
diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
index d83cb7847..775d78b15 100644
--- a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
@@ -25,13 +25,11 @@ import com.todoroo.andlib.data.Callback;
 import com.todoroo.andlib.sql.QueryTemplate;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.astrid.actfm.TagSettingsActivity;
-import com.todoroo.astrid.actfm.TagSettingsActivityTablet;
 import com.todoroo.astrid.actfm.TagViewFragment;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.api.FilterListItem;
 import com.todoroo.astrid.core.BuiltInFilterExposer;
-import com.todoroo.astrid.core.CustomFilterActivity;
 import com.todoroo.astrid.core.DeleteFilterActivity;
 import com.todoroo.astrid.core.SavedFilter;
 import com.todoroo.astrid.dao.TagDataDao;
@@ -261,20 +259,12 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList
 
     private void newListFromLaunch() {
         Intent thisIntent = getIntent();
-        Intent newTagIntent = newTagDialog();
+        Intent newTagIntent = new Intent(this, TagSettingsActivity.class);
         newTagIntent.putExtra(TagSettingsActivity.TOKEN_AUTOPOPULATE_NAME, thisIntent.getStringExtra(TOKEN_CREATE_NEW_LIST_NAME));
         thisIntent.removeExtra(TOKEN_CREATE_NEW_LIST_NAME);
         startActivityForResult(newTagIntent, NavigationDrawerFragment.REQUEST_NEW_LIST);
     }
 
-    /**
-     * Create new tag data
-     */
-    private Intent newTagDialog() {
-        Class<?> settingsComponent = preferences.useTabletLayout() ? TagSettingsActivityTablet.class : TagSettingsActivity.class;
-        return new Intent(this, settingsComponent);
-    }
-
     @Override
     public void onTaskListItemClicked(long taskId) {
         if (fragmentLayout != LAYOUT_SINGLE) {
@@ -446,16 +436,6 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList
                         this, tlf.hasDraggableOption(), preferences, tlf, tlf.getSortFlags(), tlf.getSort());
                 dialog.show();
                 return true;
-            case R.id.menu_new_filter:
-                Intent intent = new Intent(this, CustomFilterActivity.class);
-                startActivityForResult(intent, TaskListFragment.ACTIVITY_REQUEST_NEW_FILTER);
-                return true;
-            case R.id.menu_new_list:
-                startActivityForResult(newTagDialog(), NavigationDrawerFragment.REQUEST_NEW_LIST);
-                if (!preferences.useTabletLayout()) {
-                    AndroidUtilities.callOverridePendingTransition(this, R.anim.slide_left_in, R.anim.slide_left_out);
-                }
-                return true;
             default:
                 return super.onOptionsItemSelected(item);
         }
diff --git a/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java b/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
index 846b5c86a..2c9d27125 100644
--- a/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
+++ b/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
@@ -18,11 +18,13 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.todoroo.astrid.actfm.TagSettingsActivity;
 import com.todoroo.astrid.activity.AstridActivity;
 import com.todoroo.astrid.activity.TaskListFragment;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.api.FilterListItem;
+import com.todoroo.astrid.core.CustomFilterActivity;
 
 import org.tasks.R;
 import org.tasks.activities.DonationActivity;
@@ -33,6 +35,7 @@ import org.tasks.filters.NavigationDrawerSubheader;
 import org.tasks.filters.NavigationDrawerSeparator;
 import org.tasks.preferences.BasicPreferences;
 import org.tasks.preferences.HelpAndFeedbackActivity;
+import org.tasks.ui.NavigationDrawerFragment;
 
 import java.util.List;
 
@@ -226,10 +229,12 @@ public class FilterAdapter extends ArrayAdapter<FilterListItem> {
     }
 
     public void addSubMenu(final int titleResource, List<Filter> filters) {
-        if (filters.size() > 0) {
-            add(new NavigationDrawerSubheader(activity.getResources().getString(titleResource)));
+        if (filters.isEmpty()) {
+            return;
         }
 
+        add(new NavigationDrawerSubheader(activity.getResources().getString(titleResource)));
+
         for (FilterListItem filterListItem : filters) {
             add(filterListItem);
         }
@@ -249,6 +254,20 @@ public class FilterAdapter extends ArrayAdapter<FilterListItem> {
         if (navigationDrawer) {
             add(new NavigationDrawerSeparator());
 
+            add(new NavigationDrawerAction(
+                    activity.getResources().getString(R.string.new_tag),
+                    getResource(activity, R.attr.ic_action_new_tag),
+                    new Intent(activity, TagSettingsActivity.class),
+                    NavigationDrawerFragment.REQUEST_NEW_LIST));
+
+            add(new NavigationDrawerAction(
+                    activity.getResources().getString(R.string.FLA_new_filter),
+                    getResource(activity, R.attr.ic_action_new_tag),
+                    new Intent(activity, CustomFilterActivity.class),
+                    TaskListFragment.ACTIVITY_REQUEST_NEW_FILTER));
+
+            add(new NavigationDrawerSeparator());
+
             add(new NavigationDrawerAction(
                     activity.getResources().getString(R.string.TLA_menu_settings),
                     getResource(activity, R.attr.ic_action_settings),
diff --git a/src/main/java/org/tasks/injection/ActivityModule.java b/src/main/java/org/tasks/injection/ActivityModule.java
index b08d002d4..2244e1e50 100644
--- a/src/main/java/org/tasks/injection/ActivityModule.java
+++ b/src/main/java/org/tasks/injection/ActivityModule.java
@@ -3,7 +3,6 @@ package org.tasks.injection;
 import android.app.Activity;
 
 import com.todoroo.astrid.actfm.TagSettingsActivity;
-import com.todoroo.astrid.actfm.TagSettingsActivityTablet;
 import com.todoroo.astrid.activity.BeastModePreferences;
 import com.todoroo.astrid.activity.FilterShortcutActivity;
 import com.todoroo.astrid.activity.ShareLinkActivity;
@@ -54,7 +53,6 @@ import dagger.Provides;
                 TaskEditActivity.class,
                 ShareLinkActivity.class,
                 TagSettingsActivity.class,
-                TagSettingsActivityTablet.class,
                 CustomFilterActivity.class,
                 MissedCallActivity.class,
                 CalendarAlarmListCreator.class,
diff --git a/src/main/java/org/tasks/ui/NavigationDrawerFragment.java b/src/main/java/org/tasks/ui/NavigationDrawerFragment.java
index a71bf5ada..18bdbac33 100644
--- a/src/main/java/org/tasks/ui/NavigationDrawerFragment.java
+++ b/src/main/java/org/tasks/ui/NavigationDrawerFragment.java
@@ -18,6 +18,9 @@ import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ListView;
 
+import com.todoroo.astrid.actfm.TagSettingsActivity;
+import com.todoroo.astrid.activity.AstridActivity;
+import com.todoroo.astrid.activity.TaskListActivity;
 import com.todoroo.astrid.activity.TaskListFragment;
 import com.todoroo.astrid.adapter.FilterAdapter;
 import com.todoroo.astrid.api.AstridApiConstants;
@@ -110,6 +113,19 @@ public class NavigationDrawerFragment extends InjectingFragment {
                 getActivity().finish();
                 getActivity().startActivity(getActivity().getIntent());
             }
+        } else if ((requestCode == NavigationDrawerFragment.REQUEST_NEW_LIST ||
+                requestCode == TaskListFragment.ACTIVITY_REQUEST_NEW_FILTER) &&
+                resultCode == Activity.RESULT_OK) {
+            if(data == null) {
+                return;
+            }
+
+            Filter newList = data.getParcelableExtra(TagSettingsActivity.TOKEN_NEW_FILTER);
+            if (newList != null) {
+                getActivity().getIntent().putExtra(TaskListActivity.TOKEN_SWITCH_TO_FILTER, newList);
+                clear();
+            }
+
         } else {
             super.onActivityResult(requestCode, resultCode, data);
         }
diff --git a/src/main/res/drawable-hdpi/ic_add_black_24dp.png b/src/main/res/drawable-hdpi/ic_add_black_24dp.png
new file mode 100644
index 000000000..c04b523c4
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_add_black_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_add_white_24dp.png b/src/main/res/drawable-hdpi/ic_add_white_24dp.png
new file mode 100644
index 000000000..694179bd4
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_add_white_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_add_black_24dp.png b/src/main/res/drawable-xhdpi/ic_add_black_24dp.png
new file mode 100644
index 000000000..3191d5283
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_add_black_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_add_white_24dp.png b/src/main/res/drawable-xhdpi/ic_add_white_24dp.png
new file mode 100644
index 000000000..67bb598e5
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_add_white_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png
new file mode 100644
index 000000000..a84106b01
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png
new file mode 100644
index 000000000..0fdced8fc
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png differ
diff --git a/src/main/res/drawable/ic_add_black_24dp.png b/src/main/res/drawable/ic_add_black_24dp.png
new file mode 100644
index 000000000..23bf11921
Binary files /dev/null and b/src/main/res/drawable/ic_add_black_24dp.png differ
diff --git a/src/main/res/drawable/ic_add_white_24dp.png b/src/main/res/drawable/ic_add_white_24dp.png
new file mode 100644
index 000000000..3856041d7
Binary files /dev/null and b/src/main/res/drawable/ic_add_white_24dp.png differ
diff --git a/src/main/res/layout/tag_settings_activity.xml b/src/main/res/layout/tag_settings_activity.xml
index 1f485bfb6..d466cace6 100644
--- a/src/main/res/layout/tag_settings_activity.xml
+++ b/src/main/res/layout/tag_settings_activity.xml
@@ -1,60 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/settings"
-    android:background="?attr/asEditBackground"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_weight="100"
-    android:padding="10dip"
-    android:paddingTop="0dip" >
-
-    <LinearLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/asContentBackground"
+    android:orientation="vertical">
+
+    <include layout="@layout/toolbar" />
+
+    <include layout="@layout/toolbar_separator"/>
+
+    <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/settings"
+        android:background="?attr/asEditBackground"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" >
+        android:layout_height="0dp"
+        android:layout_weight="100"
+        android:padding="10dip"
+        android:paddingTop="0dip" >
 
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="5dip"
-            android:paddingTop="5dip" >
-
-            <!-- picture -->
-
-            <TextView
-                android:id="@+id/tag_label"
-                style="@style/TextAppearance"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentTop="true"
-                android:text="@string/actfm_TVA_tag_label" />
+            android:orientation="vertical" >
 
-            <LinearLayout
-                android:background="?attr/asEditRowBackground"
+            <RelativeLayout
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/tag_label"
-                android:layout_marginTop="14dip"
-                android:padding="10dip"
-                android:paddingBottom="14dip" >
-
-                <EditText
-                    android:id="@+id/tag_name"
-                    android:textColor="@android:color/black"
+                android:paddingBottom="5dip"
+                android:paddingTop="5dip" >
+
+                <!-- picture -->
+
+                <TextView
+                    android:id="@+id/tag_label"
+                    style="@style/TextAppearance"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentTop="true"
+                    android:text="@string/actfm_TVA_tag_label" />
+
+                <LinearLayout
+                    android:background="?attr/asEditRowBackground"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:background="#00000000"
-                    android:hint="@string/actfm_TVA_tag_name_hint"
-                    android:singleLine="true"
-                    android:inputType="textCapSentences"
-                    android:imeOptions="flagNoExtractUi"
-                    android:textSize="15sp" />
-            </LinearLayout>
-        </RelativeLayout>
-    </LinearLayout>
-</ScrollView>
+                    android:layout_below="@id/tag_label"
+                    android:layout_marginTop="14dip"
+                    android:padding="10dip"
+                    android:paddingBottom="14dip" >
+
+                    <EditText
+                        android:id="@+id/tag_name"
+                        android:textColor="@android:color/black"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:background="#00000000"
+                        android:hint="@string/actfm_TVA_tag_name_hint"
+                        android:singleLine="true"
+                        android:inputType="textCapSentences"
+                        android:imeOptions="flagNoExtractUi"
+                        android:textSize="15sp" />
+                </LinearLayout>
+            </RelativeLayout>
+        </LinearLayout>
+    </ScrollView>
+
+</LinearLayout>
diff --git a/src/main/res/menu/task_list_activity.xml b/src/main/res/menu/task_list_activity.xml
index 8613c4ce8..4b1f4ec5b 100644
--- a/src/main/res/menu/task_list_activity.xml
+++ b/src/main/res/menu/task_list_activity.xml
@@ -23,12 +23,4 @@
         android:title="@string/gtasks_GTA_clear_completed"
         android:visible="false"
         tasks:showAsAction="never" />
-    <item
-        android:id="@+id/menu_new_list"
-        android:title="@string/FLA_new_list"
-        tasks:showAsAction="never" />
-    <item
-        android:id="@+id/menu_new_filter"
-        android:title="@string/FLA_new_filter"
-        tasks:showAsAction="never" />
 </menu>
\ No newline at end of file
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 07f8cda82..cbf2f4dd8 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -45,7 +45,6 @@
 	<string name="SSD_sort_modified">بواسطة التعديل الأخير</string>
 	<string name="SSD_save_temp">مره واحده فقط</string>
 	<string name="SSD_save_always">دائماً</string>
-	<string name="FLA_new_list">قائمة جديدة</string>
 	<string name="FLA_no_filter_selected">لم يتم اختيار فلتر! ارجو اختيار فلتر او قائمة</string>
 	<string name="TEA_title_hint">اسم المهمة</string>
 	<string name="TEA_deadline_hint">تعيين تاريخ الاستحقاق</string>
diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml
index 2b2717579..434ce66da 100644
--- a/src/main/res/values-bg-rBG/strings.xml
+++ b/src/main/res/values-bg-rBG/strings.xml
@@ -67,7 +67,6 @@
 	<string name="SSD_save_always">Винаги</string>
 	<string name="FLA_search_filter">Съвпада с \'%s\'</string>
 	<string name="FLA_new_filter">Нов филтър</string>
-	<string name="FLA_new_list">Нов списък</string>
 	<string name="FLA_no_filter_selected">Няма избран филтър! Моля изберете филтър или списък.</string>
 	<string name="TEA_title_hint">Име на задачата</string>
 	<string name="TEA_importance_label">Приоритет</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 716867b4c..30741c4f4 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -62,7 +62,6 @@
 	<string name="SSD_save_always">Sempre</string>
 	<string name="FLA_search_filter">Coincidència \'%s\'</string>
 	<string name="FLA_new_filter">Filtre nou</string>
-	<string name="FLA_new_list">Llista nova</string>
 	<string name="FLA_no_filter_selected">No heu seleccionat cap filtre. Seleccioneu un filtre o una llista.</string>
 	<string name="TEA_title_hint">Resum de la tasca</string>
 	<string name="TEA_importance_label">Importància</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index a38323b0e..99e3853aa 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -64,7 +64,6 @@
 	<string name="SSD_save_always">Vždy</string>
 	<string name="FLA_search_filter">Hledanému \'%s\' odpovídá:</string>
 	<string name="FLA_new_filter">Nový Filtr</string>
-	<string name="FLA_new_list">Nový seznam</string>
 	<string name="FLA_no_filter_selected">Není vybrán žádný filtr! Vyberte prosím filtr nebo seznam.</string>
 	<string name="TEA_title_hint">Souhrn úkolu</string>
 	<string name="TEA_importance_label">Důležitost</string>
diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
index 770eeece3..30579a255 100644
--- a/src/main/res/values-da/strings.xml
+++ b/src/main/res/values-da/strings.xml
@@ -57,7 +57,6 @@
 	<string name="SSD_save_always">Altid</string>
 	<string name="FLA_search_filter">Matcher \'%s\'</string>
 	<string name="FLA_new_filter">Nyt filter</string>
-	<string name="FLA_new_list">Ny liste</string>
 	<string name="FLA_no_filter_selected">Der er ikke valgt et filter! Vælg venligst et filter eller en liste.</string>
 	<string name="TEA_title_hint">Opgave Overskrift</string>
 	<string name="TEA_importance_label">Vigtighed</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index d6f3a7c29..81033d67a 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -63,7 +63,6 @@
 	<string name="SSD_save_always">Immer</string>
 	<string name="FLA_search_filter">Übereinstimmung mit %s</string>
 	<string name="FLA_new_filter">Neuer Filter</string>
-	<string name="FLA_new_list">Neue Liste</string>
 	<string name="FLA_no_filter_selected">Kein Filter ausgewählt! Bitte Filter oder Liste auswählen.</string>
 	<string name="TEA_title_hint">Aufgabenname</string>
 	<string name="TEA_importance_label">Priorität</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index bc33ea57c..fa7e59464 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -62,7 +62,6 @@
 	<string name="SSD_save_always">Πάντα</string>
 	<string name="FLA_search_filter">Ταιριάζουν \'%s\'</string>
 	<string name="FLA_new_filter">Νέο φίλτρο</string>
-	<string name="FLA_new_list">Νέα λίστα</string>
 	<string name="FLA_no_filter_selected">Δεν επιλέχθηκε φίλτρο! Παρακαλώ επιλέξτε ενα φίλτρο η μια λίστα</string>
 	<string name="TEA_title_hint">Όνομα καθήκοντος</string>
 	<string name="TEA_importance_label">Προτεραιότητα</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index f46e6debc..f82359ea6 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -64,7 +64,6 @@
 	<string name="SSD_save_always">Siempre</string>
 	<string name="FLA_search_filter">Coincidencias con \'%s\'</string>
 	<string name="FLA_new_filter">Nuevo filtro</string>
-	<string name="FLA_new_list">Nueva lista</string>
 	<string name="FLA_no_filter_selected">No hay filtro seleccionado! Por favor seleccione un filtro o lista.</string>
 	<string name="TEA_title_hint">Nombre de la tarea</string>
 	<string name="TEA_importance_label">Prioridad</string>
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index 6859f27f3..f1a986f13 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -21,7 +21,6 @@
 	<string name="SSD_save_always">Aina</string>
 	<string name="FLA_search_filter">Sopivuus \'%s\'</string>
 	<string name="FLA_new_filter">Uusi suodin</string>
-	<string name="FLA_new_list">Uusi lista</string>
 	<string name="FLA_no_filter_selected">Suodatinta ei valittu! Valitse suodatin tai lista.</string>
 	<string name="TEA_title_hint">Tehtävän nimi</string>
 	<string name="TEA_importance_label">Etusija</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 5100da85a..e838166b6 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -64,7 +64,6 @@
 	<string name="SSD_save_always">Toujours</string>
 	<string name="FLA_search_filter">Correspondant \'%s\'</string>
 	<string name="FLA_new_filter">Nouveau filtre</string>
-	<string name="FLA_new_list">Nouvelle liste</string>
 	<string name="FLA_no_filter_selected">Aucun filtre sélectionné ! Veuillez sélectionner un filtre ou une liste.</string>
 	<string name="TEA_title_hint">Nom de la tâche</string>
 	<string name="TEA_importance_label">Priorité</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 1dd46d3b4..0fcda4870 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -61,7 +61,6 @@
 	<string name="SSD_save_always">Sempre</string>
 	<string name="FLA_search_filter">Confrontando \'%s\'</string>
 	<string name="FLA_new_filter">Nuovo Filtro</string>
-	<string name="FLA_new_list">Nuova lista</string>
 	<string name="FLA_no_filter_selected">Filtro non selezionato! Perfavore seleziona un filtro o una lista.</string>
 	<string name="TEA_importance_label">Priorità</string>
 	<string name="TEA_note_label">Descrizione</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index c429bb738..ff4f69025 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -64,7 +64,6 @@
 	<string name="SSD_save_always">תמיד</string>
 	<string name="FLA_search_filter">התאים ל\'%s\'</string>
 	<string name="FLA_new_filter">מַסְנֵן חדש</string>
-	<string name="FLA_new_list">רשימה חדשה</string>
 	<string name="FLA_no_filter_selected">לא נבחר מַסְנֵן! אנא בחר מַסְנֵן או רשימה.</string>
 	<string name="TEA_title_hint">שם המשימה</string>
 	<string name="TEA_importance_label">עדיפות</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 4b3ba2b8f..7ffcc5862 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -64,7 +64,6 @@
 	<string name="SSD_save_always">設定の保存</string>
 	<string name="FLA_search_filter">「%s」の検索結果</string>
 	<string name="FLA_new_filter">新しいフィルタ</string>
-	<string name="FLA_new_list">新しいリスト</string>
 	<string name="FLA_no_filter_selected">フィルターが選択されていません! フィルターかリストを選択してください.</string>
 	<string name="TEA_title_hint">タスク名</string>
 	<string name="TEA_importance_label">優先順位</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 4803ef470..5a924adbd 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -67,7 +67,6 @@
 	<string name="SSD_save_always">항상 정렬</string>
 	<string name="FLA_search_filter">\'%s\' 검색 중</string>
 	<string name="FLA_new_filter">새 필터</string>
-	<string name="FLA_new_list">새 목록</string>
 	<string name="FLA_no_filter_selected">필터를 선택하지 않았습니다! 필터나 목록을 선택하세요.</string>
 	<string name="TEA_title_hint">일정 이름</string>
 	<string name="TEA_importance_label">우선순위</string>
diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml
index b41f89b5d..e49aa90de 100644
--- a/src/main/res/values-nb/strings.xml
+++ b/src/main/res/values-nb/strings.xml
@@ -52,7 +52,6 @@
 	<string name="SSD_save_always">Alltid</string>
 	<string name="FLA_search_filter">Matcher \'%s\'</string>
 	<string name="FLA_new_filter">Nytt filter</string>
-	<string name="FLA_new_list">Ny liste</string>
 	<string name="TEA_title_hint">Oppgavesammendrag</string>
 	<string name="TEA_importance_label">Viktighet</string>
 	<string name="TEA_hideUntil_label">Skjul frem til</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 957c019b6..235c386da 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -64,7 +64,6 @@
 	<string name="SSD_save_always">Altijd</string>
 	<string name="FLA_search_filter">Bevat \'%s\'</string>
 	<string name="FLA_new_filter">Nieuw Filter</string>
-	<string name="FLA_new_list">Nieuwe lijst</string>
 	<string name="FLA_no_filter_selected">Geen filter geselecteerd! Selecteer een filter of lijst.</string>
 	<string name="TEA_title_hint">Taak naam</string>
 	<string name="TEA_importance_label">Prioriteit</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 5ecba74ca..cb47bad2a 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -64,7 +64,6 @@
 	<string name="SSD_save_always">Zawsze</string>
 	<string name="FLA_search_filter">Pasujących do: %s</string>
 	<string name="FLA_new_filter">Nowy filtr</string>
-	<string name="FLA_new_list">Nowa lista</string>
 	<string name="FLA_no_filter_selected">Nie wybraon filtra! Wybierz filtr lub listę.</string>
 	<string name="TEA_title_hint">Tytuł zadania</string>
 	<string name="TEA_importance_label">Priorytet</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 74b3da4ab..7bc819564 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -63,7 +63,6 @@
 	<string name="SSD_save_always">Sempre</string>
 	<string name="FLA_search_filter">Encontradas para \'%s\'</string>
 	<string name="FLA_new_filter">Novo Filtro</string>
-	<string name="FLA_new_list">Nova lista</string>
 	<string name="FLA_no_filter_selected">Sem filtro selecionado! Selecione um filtro ou lista.</string>
 	<string name="TEA_title_hint">Nome da tarefa</string>
 	<string name="TEA_importance_label">Prioridade</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 788202236..2a0de240e 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -66,7 +66,6 @@
 	<string name="SSD_save_always">Sempre</string>
 	<string name="FLA_search_filter">Coincidente com %s</string>
 	<string name="FLA_new_filter">Novo filtro</string>
-	<string name="FLA_new_list">Nova lista</string>
 	<string name="FLA_no_filter_selected">Não selecionou o filtro! Selecione um filtro ou uma lista.</string>
 	<string name="TEA_title_hint">Nome da tarefa</string>
 	<string name="TEA_importance_label">Prioridade</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index e62bb2092..2ebb87a71 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -64,7 +64,6 @@
 	<string name="SSD_save_always">Всегда</string>
 	<string name="FLA_search_filter">Соответствует \'%s\'</string>
 	<string name="FLA_new_filter">Новый фильтр</string>
-	<string name="FLA_new_list">Новый список</string>
 	<string name="FLA_no_filter_selected">Фильтры не выбраны! Пожалуйста, выберите фильтр или список</string>
 	<string name="TEA_title_hint">Имя задачи</string>
 	<string name="TEA_importance_label">Приоритет</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index ac602139c..87e28e5ce 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -64,7 +64,6 @@
 	<string name="SSD_save_always">Vždy</string>
 	<string name="FLA_search_filter">Zodpovedá \'%s\'</string>
 	<string name="FLA_new_filter">Nový filter</string>
-	<string name="FLA_new_list">Nový zoznam</string>
 	<string name="FLA_no_filter_selected">Nieje vybraný filter! Prosím, zvoľ si filter, alebo zoznam.</string>
 	<string name="TEA_title_hint">Názov úlohy</string>
 	<string name="TEA_importance_label">Priorita</string>
diff --git a/src/main/res/values-sl-rSI/strings.xml b/src/main/res/values-sl-rSI/strings.xml
index 28e2a55ea..01235a5d0 100644
--- a/src/main/res/values-sl-rSI/strings.xml
+++ b/src/main/res/values-sl-rSI/strings.xml
@@ -67,7 +67,6 @@
 	<string name="SSD_save_always">Vedno</string>
 	<string name="FLA_search_filter">Ujemanje za \'%s\'</string>
 	<string name="FLA_new_filter">Nov filter</string>
-	<string name="FLA_new_list">Nov seznam</string>
 	<string name="FLA_no_filter_selected">Noben filter ni izbran. Izberite filter ali seznam.</string>
 	<string name="TEA_title_hint">Poimenovanje opravka</string>
 	<string name="TEA_importance_label">Prioriteta</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 28545c308..676276443 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -64,7 +64,6 @@
 	<string name="SSD_save_always">Alltid</string>
 	<string name="FLA_search_filter">Matchar \'%s\'</string>
 	<string name="FLA_new_filter">Nytt filter</string>
-	<string name="FLA_new_list">Ny lista</string>
 	<string name="FLA_no_filter_selected">Inget filter valt! Välj ett filter eller en lista.</string>
 	<string name="TEA_title_hint">Uppgiftsnamn</string>
 	<string name="TEA_importance_label">Prioritet</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 88455ed09..1a9b7e2f6 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -61,7 +61,6 @@
 	<string name="SSD_save_always">Her zaman</string>
 	<string name="FLA_search_filter">\'%s\' ile eşleşenler</string>
 	<string name="FLA_new_filter">Yeni Filtre</string>
-	<string name="FLA_new_list">Yeni Liste</string>
 	<string name="FLA_no_filter_selected">Süzgeç seçilmemiş! Lütfen bir süzgeç ya da liste seçin.</string>
 	<string name="TEA_note_label">Açıklama</string>
 	<string name="TEA_estimatedDuration_label">Ne kadar sürecek?</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 3b2fab4b8..7e87e42a6 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -67,7 +67,6 @@
 	<string name="SSD_save_always">Завжди</string>
 	<string name="FLA_search_filter">Відповідності до %s</string>
 	<string name="FLA_new_filter">Новий фільтр</string>
-	<string name="FLA_new_list">Новий список</string>
 	<string name="FLA_no_filter_selected">Не вибраний жодний фільтр! Будь ласка, виберіть фільтр або список.</string>
 	<string name="TEA_title_hint">Ім\'я завдання</string>
 	<string name="TEA_importance_label">Пріоритет</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index f6a05a560..58cbdc045 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -61,7 +61,6 @@
 	<string name="SSD_save_always">总是</string>
 	<string name="FLA_search_filter">比对 \'%s\'</string>
 	<string name="FLA_new_filter">新建过滤器</string>
-	<string name="FLA_new_list">新建列表</string>
 	<string name="FLA_no_filter_selected">还没有选定过滤器呢！请选择一个过滤器或列表呗。</string>
 	<string name="TEA_note_label">描述</string>
 	<string name="TEA_estimatedDuration_label">要花多久时间?</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index a54e3fdbf..e752de320 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -63,7 +63,6 @@
 	<string name="SSD_save_always">總是</string>
 	<string name="FLA_search_filter">比對 \'%s\'</string>
 	<string name="FLA_new_filter">新建過濾器</string>
-	<string name="FLA_new_list">新建列表</string>
 	<string name="FLA_no_filter_selected">還沒有選定過濾器呢！請選擇一個過濾器或列表唄。</string>
 	<string name="TEA_title_hint">工作名稱</string>
 	<string name="TEA_importance_label">優先權</string>
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 6ee605f80..3fdedfc12 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -57,6 +57,7 @@
     <attr name="toolbarSeparatorHeight" format="dimension" />
     <attr name="ic_action_filter" format="reference"/>
     <attr name="ic_action_cloud" format="reference"/>
+    <attr name="ic_action_new_tag" format="reference"/>
 
     <declare-styleable name="DateAndTimePicker">
         <attr name="shortcutLabels" format="reference" />
diff --git a/src/main/res/values/strings-core.xml b/src/main/res/values/strings-core.xml
index 0e913e12c..9cf0e262d 100644
--- a/src/main/res/values/strings-core.xml
+++ b/src/main/res/values/strings-core.xml
@@ -133,9 +133,6 @@
   <!-- Menu: new filter -->
   <string name="FLA_new_filter">New Filter</string>
   
-  <!-- slide 10e: Button: new list -->
-  <string name="FLA_new_list">New List</string>
-  
   <!-- Alert when creating a shortcut without selecting a filter -->
   <string name="FLA_no_filter_selected">No filter selected! Please select a filter or list.</string>
   
diff --git a/src/main/res/values/strings-tags.xml b/src/main/res/values/strings-tags.xml
index d9499bdc7..f761dbdd9 100644
--- a/src/main/res/values/strings-tags.xml
+++ b/src/main/res/values/strings-tags.xml
@@ -13,6 +13,8 @@
   
   <!-- slide 25a: Dialog: new list -->
   <string name="tag_new_list">New List</string>
+
+  <string name="new_tag">New tag</string>
   
   <!-- Dialog: task created without title -->
   <string name="tag_no_title_error">Please enter a name for this list first!</string>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index e49a73ed1..4d977ff78 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -67,6 +67,7 @@
         <item name="ic_action_label">@drawable/ic_label_black_24dp</item>
         <item name="ic_action_filter">@drawable/ic_filter_list_black_24dp</item>
         <item name="ic_action_cloud">@drawable/ic_cloud_queue_black_24dp</item>
+        <item name="ic_action_new_tag">@drawable/ic_add_black_24dp</item>
     </style>
 
     <style name="Tasks.Dark">
@@ -110,6 +111,7 @@
         <item name="ic_action_label">@drawable/ic_label_white_24dp</item>
         <item name="ic_action_filter">@drawable/ic_filter_list_white_24dp</item>
         <item name="ic_action_cloud">@drawable/ic_cloud_queue_white_24dp</item>
+        <item name="ic_action_new_tag">@drawable/ic_add_white_24dp</item>
     </style>
 
     <style name="ActionBar.TitleText" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">