diff --git a/astrid/res/drawable-hdpi/btn_dismiss_normal.png b/astrid/res/drawable-hdpi/btn_dismiss_normal.png
new file mode 100644
index 000000000..56d75951b
Binary files /dev/null and b/astrid/res/drawable-hdpi/btn_dismiss_normal.png differ
diff --git a/astrid/res/drawable-hdpi/btn_dismiss_pressed.png b/astrid/res/drawable-hdpi/btn_dismiss_pressed.png
new file mode 100644
index 000000000..888bb1e7f
Binary files /dev/null and b/astrid/res/drawable-hdpi/btn_dismiss_pressed.png differ
diff --git a/astrid/res/drawable-hdpi/camera_button_normal.png b/astrid/res/drawable-hdpi/camera_button_normal.png
new file mode 100644
index 000000000..c6e9a8d65
Binary files /dev/null and b/astrid/res/drawable-hdpi/camera_button_normal.png differ
diff --git a/astrid/res/drawable-hdpi/camera_button_pressed.png b/astrid/res/drawable-hdpi/camera_button_pressed.png
new file mode 100644
index 000000000..dbb70555d
Binary files /dev/null and b/astrid/res/drawable-hdpi/camera_button_pressed.png differ
diff --git a/astrid/res/drawable-hdpi/list_settings.png b/astrid/res/drawable-hdpi/list_settings.png
new file mode 100644
index 000000000..9780e392f
Binary files /dev/null and b/astrid/res/drawable-hdpi/list_settings.png differ
diff --git a/astrid/res/drawable-hdpi/list_settings_pressed.png b/astrid/res/drawable-hdpi/list_settings_pressed.png
new file mode 100644
index 000000000..973e3697f
Binary files /dev/null and b/astrid/res/drawable-hdpi/list_settings_pressed.png differ
diff --git a/astrid/res/drawable-xhdpi/btn_dismiss_normal.png b/astrid/res/drawable-xhdpi/btn_dismiss_normal.png
new file mode 100644
index 000000000..d4cd21524
Binary files /dev/null and b/astrid/res/drawable-xhdpi/btn_dismiss_normal.png differ
diff --git a/astrid/res/drawable-xhdpi/btn_dismiss_pressed.png b/astrid/res/drawable-xhdpi/btn_dismiss_pressed.png
new file mode 100644
index 000000000..ed6fdbe73
Binary files /dev/null and b/astrid/res/drawable-xhdpi/btn_dismiss_pressed.png differ
diff --git a/astrid/res/drawable/btn_dismiss_normal.png b/astrid/res/drawable/btn_dismiss_normal.png
index 17e7ea758..1dd95a754 100644
Binary files a/astrid/res/drawable/btn_dismiss_normal.png and b/astrid/res/drawable/btn_dismiss_normal.png differ
diff --git a/astrid/res/drawable/btn_dismiss_pressed.png b/astrid/res/drawable/btn_dismiss_pressed.png
index aa6317fb1..e400257ff 100644
Binary files a/astrid/res/drawable/btn_dismiss_pressed.png and b/astrid/res/drawable/btn_dismiss_pressed.png differ
diff --git a/astrid/res/drawable/camera_button_blue.png b/astrid/res/drawable/camera_button_blue.png
deleted file mode 100644
index 250d256e3..000000000
Binary files a/astrid/res/drawable/camera_button_blue.png and /dev/null differ
diff --git a/astrid/res/drawable/camera_button_normal.png b/astrid/res/drawable/camera_button_normal.png
index 223e387e2..6d39e3093 100644
Binary files a/astrid/res/drawable/camera_button_normal.png and b/astrid/res/drawable/camera_button_normal.png differ
diff --git a/astrid/res/drawable/camera_button_pressed.png b/astrid/res/drawable/camera_button_pressed.png
index 51a43a480..27b14e736 100644
Binary files a/astrid/res/drawable/camera_button_pressed.png and b/astrid/res/drawable/camera_button_pressed.png differ
diff --git a/astrid/res/drawable/camera_button_red.png b/astrid/res/drawable/camera_button_red.png
deleted file mode 100644
index 04b4f01b8..000000000
Binary files a/astrid/res/drawable/camera_button_red.png and /dev/null differ
diff --git a/astrid/res/drawable/list_settings.png b/astrid/res/drawable/list_settings.png
index 1ccf63c9c..f3e925f33 100644
Binary files a/astrid/res/drawable/list_settings.png and b/astrid/res/drawable/list_settings.png differ
diff --git a/astrid/res/drawable/list_settings_pressed.png b/astrid/res/drawable/list_settings_pressed.png
new file mode 100644
index 000000000..1f732c778
Binary files /dev/null and b/astrid/res/drawable/list_settings_pressed.png differ
diff --git a/astrid/res/values-ca/strings.xml b/astrid/res/values-ca/strings.xml
index 43e92b25e..598f789fb 100644
--- a/astrid/res/values-ca/strings.xml
+++ b/astrid/res/values-ca/strings.xml
@@ -71,7 +71,7 @@
   <string name="actfm_TVA_filtered_by_assign">%s\'s tasks. Tap for all.</string>
 
   <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Private: tap to share or edit</string>
+  <string name="actfm_TVA_no_members_alert">Private: tap to edit or share list</string>
 
   <!-- Tag View Menu: refresh -->
   <string name="actfm_TVA_menu_refresh">Refresh</string>
diff --git a/astrid/res/values-cs/strings.xml b/astrid/res/values-cs/strings.xml
index 45b679997..98c095a9d 100644
--- a/astrid/res/values-cs/strings.xml
+++ b/astrid/res/values-cs/strings.xml
@@ -71,7 +71,7 @@
   <string name="actfm_TVA_filtered_by_assign">%s\'s tasks. Tap for all.</string>
 
   <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Private: tap to share or edit</string>
+  <string name="actfm_TVA_no_members_alert">Private: tap to edit or share list</string>
 
   <!-- Tag View Menu: refresh -->
   <string name="actfm_TVA_menu_refresh">Refresh</string>
diff --git a/astrid/res/values-da/strings.xml b/astrid/res/values-da/strings.xml
index c0021efc9..285beda64 100644
--- a/astrid/res/values-da/strings.xml
+++ b/astrid/res/values-da/strings.xml
@@ -71,7 +71,7 @@
   <string name="actfm_TVA_filtered_by_assign">%s\'s tasks. Tap for all.</string>
 
   <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Private: tap to share or edit</string>
+  <string name="actfm_TVA_no_members_alert">Private: tap to edit or share list</string>
 
   <!-- Tag View Menu: refresh -->
   <string name="actfm_TVA_menu_refresh">Opdater</string>
diff --git a/astrid/res/values-de/strings.xml b/astrid/res/values-de/strings.xml
index 1f1b13e82..498319d34 100644
--- a/astrid/res/values-de/strings.xml
+++ b/astrid/res/values-de/strings.xml
@@ -71,7 +71,7 @@
   <string name="actfm_TVA_filtered_by_assign">%s\'s tasks. Tap for all.</string>
 
   <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Private: tap to share or edit</string>
+  <string name="actfm_TVA_no_members_alert">Private: tap to edit or share list</string>
 
   <!-- Tag View Menu: refresh -->
   <string name="actfm_TVA_menu_refresh">Aktualisieren</string>
diff --git a/astrid/res/values-es/strings.xml b/astrid/res/values-es/strings.xml
index 97af3d222..016b52dab 100644
--- a/astrid/res/values-es/strings.xml
+++ b/astrid/res/values-es/strings.xml
@@ -71,7 +71,7 @@
   <string name="actfm_TVA_filtered_by_assign">%s\'s tasks. Tap for all.</string>
 
   <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Private: tap to share or edit</string>
+  <string name="actfm_TVA_no_members_alert">Private: tap to edit or share list</string>
 
   <!-- Tag View Menu: refresh -->
   <string name="actfm_TVA_menu_refresh">Actualizar</string>
diff --git a/astrid/res/values-fr/strings.xml b/astrid/res/values-fr/strings.xml
index c7e9a0925..337ad8138 100644
--- a/astrid/res/values-fr/strings.xml
+++ b/astrid/res/values-fr/strings.xml
@@ -71,7 +71,7 @@
   <string name="actfm_TVA_filtered_by_assign">%s\'s tasks. Tap for all.</string>
 
   <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Private: tap to share or edit</string>
+  <string name="actfm_TVA_no_members_alert">Private: tap to edit or share list</string>
 
   <!-- Tag View Menu: refresh -->
   <string name="actfm_TVA_menu_refresh">Mettre à jour</string>
diff --git a/astrid/res/values-he/strings.xml b/astrid/res/values-he/strings.xml
index 487578f52..5a6f354d0 100644
--- a/astrid/res/values-he/strings.xml
+++ b/astrid/res/values-he/strings.xml
@@ -71,7 +71,7 @@
   <string name="actfm_TVA_filtered_by_assign">%s\'s tasks. Tap for all.</string>
 
   <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Private: tap to share or edit</string>
+  <string name="actfm_TVA_no_members_alert">Private: tap to edit or share list</string>
 
   <!-- Tag View Menu: refresh -->
   <string name="actfm_TVA_menu_refresh">Refresh</string>
diff --git a/astrid/res/values-it/strings.xml b/astrid/res/values-it/strings.xml
index 504489794..61041af97 100644
--- a/astrid/res/values-it/strings.xml
+++ b/astrid/res/values-it/strings.xml
@@ -71,7 +71,7 @@
   <string name="actfm_TVA_filtered_by_assign">%s\'s tasks. Tap for all.</string>
 
   <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Private: tap to share or edit</string>
+  <string name="actfm_TVA_no_members_alert">Private: tap to edit or share list</string>
 
   <!-- Tag View Menu: refresh -->
   <string name="actfm_TVA_menu_refresh">Refresh</string>
diff --git a/astrid/res/values-ja/strings.xml b/astrid/res/values-ja/strings.xml
index b4eb5b16f..03e23da87 100644
--- a/astrid/res/values-ja/strings.xml
+++ b/astrid/res/values-ja/strings.xml
@@ -71,7 +71,7 @@
   <string name="actfm_TVA_filtered_by_assign">%s\'s tasks. Tap for all.</string>
 
   <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Private: tap to share or edit</string>
+  <string name="actfm_TVA_no_members_alert">Private: tap to edit or share list</string>
 
   <!-- Tag View Menu: refresh -->
   <string name="actfm_TVA_menu_refresh">Refresh</string>
diff --git a/astrid/res/values-ko/strings.xml b/astrid/res/values-ko/strings.xml
index 2670d7d39..13c897ecd 100644
--- a/astrid/res/values-ko/strings.xml
+++ b/astrid/res/values-ko/strings.xml
@@ -71,7 +71,7 @@
   <string name="actfm_TVA_filtered_by_assign">%s\'s tasks. Tap for all.</string>
 
   <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Private: tap to share or edit</string>
+  <string name="actfm_TVA_no_members_alert">Private: tap to edit or share list</string>
 
   <!-- Tag View Menu: refresh -->
   <string name="actfm_TVA_menu_refresh">Refresh</string>
diff --git a/astrid/res/values-nb/strings.xml b/astrid/res/values-nb/strings.xml
index b3d8ae5a8..ed826fc52 100644
--- a/astrid/res/values-nb/strings.xml
+++ b/astrid/res/values-nb/strings.xml
@@ -71,7 +71,7 @@
   <string name="actfm_TVA_filtered_by_assign">%s\'s tasks. Tap for all.</string>
 
   <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Private: tap to share or edit</string>
+  <string name="actfm_TVA_no_members_alert">Private: tap to edit or share list</string>
 
   <!-- Tag View Menu: refresh -->
   <string name="actfm_TVA_menu_refresh">Refresh</string>
diff --git a/astrid/res/values-nl/strings.xml b/astrid/res/values-nl/strings.xml
index bf198556d..43e54b24a 100644
--- a/astrid/res/values-nl/strings.xml
+++ b/astrid/res/values-nl/strings.xml
@@ -71,7 +71,7 @@
   <string name="actfm_TVA_filtered_by_assign">%s\'s tasks. Tap for all.</string>
 
   <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Private: tap to share or edit</string>
+  <string name="actfm_TVA_no_members_alert">Private: tap to edit or share list</string>
 
   <!-- Tag View Menu: refresh -->
   <string name="actfm_TVA_menu_refresh">Vernieuwen</string>
diff --git a/astrid/res/values-pt-rBR/strings.xml b/astrid/res/values-pt-rBR/strings.xml
index e40cd650b..b635be82b 100644
--- a/astrid/res/values-pt-rBR/strings.xml
+++ b/astrid/res/values-pt-rBR/strings.xml
@@ -71,7 +71,7 @@
   <string name="actfm_TVA_filtered_by_assign">%s\'s tasks. Tap for all.</string>
 
   <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Private: tap to share or edit</string>
+  <string name="actfm_TVA_no_members_alert">Private: tap to edit or share list</string>
 
   <!-- Tag View Menu: refresh -->
   <string name="actfm_TVA_menu_refresh">Atualizar</string>
diff --git a/astrid/res/values-pt/strings.xml b/astrid/res/values-pt/strings.xml
index 5a21f37e1..a8fd906aa 100644
--- a/astrid/res/values-pt/strings.xml
+++ b/astrid/res/values-pt/strings.xml
@@ -71,7 +71,7 @@
   <string name="actfm_TVA_filtered_by_assign">%s\'s tasks. Tap for all.</string>
 
   <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Private: tap to share or edit</string>
+  <string name="actfm_TVA_no_members_alert">Private: tap to edit or share list</string>
 
   <!-- Tag View Menu: refresh -->
   <string name="actfm_TVA_menu_refresh">Refresh</string>
diff --git a/astrid/res/values-ru/strings.xml b/astrid/res/values-ru/strings.xml
index 037e8b0c3..bc61cf880 100644
--- a/astrid/res/values-ru/strings.xml
+++ b/astrid/res/values-ru/strings.xml
@@ -71,7 +71,7 @@
   <string name="actfm_TVA_filtered_by_assign">%s\'s tasks. Tap for all.</string>
 
   <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Private: tap to share or edit</string>
+  <string name="actfm_TVA_no_members_alert">Private: tap to edit or share list</string>
 
   <!-- Tag View Menu: refresh -->
   <string name="actfm_TVA_menu_refresh">Обновить</string>
diff --git a/astrid/res/values-sv/strings.xml b/astrid/res/values-sv/strings.xml
index 789587e56..2b1b1fb2d 100644
--- a/astrid/res/values-sv/strings.xml
+++ b/astrid/res/values-sv/strings.xml
@@ -71,7 +71,7 @@
   <string name="actfm_TVA_filtered_by_assign">%s\'s tasks. Tap for all.</string>
 
   <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Private: tap to share or edit</string>
+  <string name="actfm_TVA_no_members_alert">Private: tap to edit or share list</string>
 
   <!-- Tag View Menu: refresh -->
   <string name="actfm_TVA_menu_refresh">Uppdatera</string>
diff --git a/astrid/res/values-th/strings.xml b/astrid/res/values-th/strings.xml
index f10fc91f0..11bfd9ce8 100644
--- a/astrid/res/values-th/strings.xml
+++ b/astrid/res/values-th/strings.xml
@@ -71,7 +71,7 @@
   <string name="actfm_TVA_filtered_by_assign">%s\'s tasks. Tap for all.</string>
 
   <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Private: tap to share or edit</string>
+  <string name="actfm_TVA_no_members_alert">Private: tap to edit or share list</string>
 
   <!-- Tag View Menu: refresh -->
   <string name="actfm_TVA_menu_refresh">Refresh</string>
diff --git a/astrid/res/values-zh-rCN/strings.xml b/astrid/res/values-zh-rCN/strings.xml
index a9ceb823d..867017a9d 100644
--- a/astrid/res/values-zh-rCN/strings.xml
+++ b/astrid/res/values-zh-rCN/strings.xml
@@ -71,7 +71,7 @@
   <string name="actfm_TVA_filtered_by_assign">%s\'s tasks. Tap for all.</string>
 
   <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Private: tap to share or edit</string>
+  <string name="actfm_TVA_no_members_alert">Private: tap to edit or share list</string>
 
   <!-- Tag View Menu: refresh -->
   <string name="actfm_TVA_menu_refresh">刷新</string>
diff --git a/astrid/res/values-zh-rTW/strings.xml b/astrid/res/values-zh-rTW/strings.xml
index 7bdb223b4..c18767a11 100644
--- a/astrid/res/values-zh-rTW/strings.xml
+++ b/astrid/res/values-zh-rTW/strings.xml
@@ -71,7 +71,7 @@
   <string name="actfm_TVA_filtered_by_assign">%s\'s tasks. Tap for all.</string>
 
   <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Private: tap to share or edit</string>
+  <string name="actfm_TVA_no_members_alert">Private: tap to edit or share list</string>
 
   <!-- Tag View Menu: refresh -->
   <string name="actfm_TVA_menu_refresh">Refresh</string>
diff --git a/astrid/res/values/strings-actfm.xml b/astrid/res/values/strings-actfm.xml
index 363f69ed0..c4100cf1c 100644
--- a/astrid/res/values/strings-actfm.xml
+++ b/astrid/res/values/strings-actfm.xml
@@ -74,7 +74,7 @@
   <string name="actfm_TVA_filter_by_unassigned">Unassigned tasks. Tap for all.</string>
 
   <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Private: tap to share or edit</string>
+  <string name="actfm_TVA_no_members_alert">Private: tap to edit or share list</string>
 
   <!-- Tag View Menu: refresh -->
   <string name="actfm_TVA_menu_refresh">Refresh</string>