diff --git a/app/src/main/res/drawable-hdpi-v11/ic_notification_full_node.png b/app/src/main/res/drawable-hdpi-v11/ic_notification_full_node.png
deleted file mode 100644
index 337fc04..0000000
Binary files a/app/src/main/res/drawable-hdpi-v11/ic_notification_full_node.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_close.png b/app/src/main/res/drawable-hdpi/ic_action_close.png
deleted file mode 100644
index 7031319..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_close.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_delete.png b/app/src/main/res/drawable-hdpi/ic_action_delete.png
deleted file mode 100755
index d912755..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_delete.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_mark_unread.png b/app/src/main/res/drawable-hdpi/ic_action_mark_unread.png
deleted file mode 100644
index c9ce724..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_mark_unread.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_placeholder.png b/app/src/main/res/drawable-hdpi/ic_action_placeholder.png
deleted file mode 100644
index cde7713..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_placeholder.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_reply.png b/app/src/main/res/drawable-hdpi/ic_action_reply.png
deleted file mode 100755
index 7414772..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_reply.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_send.png b/app/src/main/res/drawable-hdpi/ic_action_send.png
deleted file mode 100644
index e6c165d..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_send.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_fab_compose_message.png b/app/src/main/res/drawable-hdpi/ic_fab_compose_message.png
deleted file mode 100644
index 4c86788..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_fab_compose_message.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_notification_full_node.png b/app/src/main/res/drawable-hdpi/ic_notification_full_node.png
deleted file mode 100644
index fa17418..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_notification_full_node.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_notification_new_message.png b/app/src/main/res/drawable-hdpi/ic_notification_new_message.png
deleted file mode 100644
index 096746b..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_notification_new_message.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_plus_sign.png b/app/src/main/res/drawable-hdpi/ic_plus_sign.png
deleted file mode 100755
index 54aef05..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_plus_sign.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi-v11/ic_notification_full_node.png b/app/src/main/res/drawable-mdpi-v11/ic_notification_full_node.png
deleted file mode 100644
index 074a2ac..0000000
Binary files a/app/src/main/res/drawable-mdpi-v11/ic_notification_full_node.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_close.png b/app/src/main/res/drawable-mdpi/ic_action_close.png
deleted file mode 100644
index c71f1c4..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_close.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_delete.png b/app/src/main/res/drawable-mdpi/ic_action_delete.png
deleted file mode 100755
index 864553a..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_delete.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_mark_unread.png b/app/src/main/res/drawable-mdpi/ic_action_mark_unread.png
deleted file mode 100644
index f74f84a..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_mark_unread.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_placeholder.png b/app/src/main/res/drawable-mdpi/ic_action_placeholder.png
deleted file mode 100644
index 6fd4dcd..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_placeholder.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_reply.png b/app/src/main/res/drawable-mdpi/ic_action_reply.png
deleted file mode 100755
index a25803b..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_reply.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_send.png b/app/src/main/res/drawable-mdpi/ic_action_send.png
deleted file mode 100644
index ca5ad5c..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_send.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_fab_compose_message.png b/app/src/main/res/drawable-mdpi/ic_fab_compose_message.png
deleted file mode 100644
index ea4de02..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_fab_compose_message.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_notification_full_node.png b/app/src/main/res/drawable-mdpi/ic_notification_full_node.png
deleted file mode 100644
index 0289015..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_notification_full_node.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_notification_new_message.png b/app/src/main/res/drawable-mdpi/ic_notification_new_message.png
deleted file mode 100644
index 456614b..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_notification_new_message.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_plus_sign.png b/app/src/main/res/drawable-mdpi/ic_plus_sign.png
deleted file mode 100755
index 7284077..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_plus_sign.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi-v11/ic_notification_full_node.png b/app/src/main/res/drawable-xhdpi-v11/ic_notification_full_node.png
deleted file mode 100644
index 1d59a55..0000000
Binary files a/app/src/main/res/drawable-xhdpi-v11/ic_notification_full_node.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_close.png b/app/src/main/res/drawable-xhdpi/ic_action_close.png
deleted file mode 100644
index 2eb9589..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_close.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_delete.png b/app/src/main/res/drawable-xhdpi/ic_action_delete.png
deleted file mode 100755
index 37e9c21..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_delete.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_mark_unread.png b/app/src/main/res/drawable-xhdpi/ic_action_mark_unread.png
deleted file mode 100644
index 35083d1..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_mark_unread.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_placeholder.png b/app/src/main/res/drawable-xhdpi/ic_action_placeholder.png
deleted file mode 100644
index ae7c98f..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_placeholder.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_reply.png b/app/src/main/res/drawable-xhdpi/ic_action_reply.png
deleted file mode 100755
index 8b1d033..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_reply.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_send.png b/app/src/main/res/drawable-xhdpi/ic_action_send.png
deleted file mode 100644
index 04daa14..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_send.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_fab_compose_message.png b/app/src/main/res/drawable-xhdpi/ic_fab_compose_message.png
deleted file mode 100644
index af0217a..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_fab_compose_message.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_notification_full_node.png b/app/src/main/res/drawable-xhdpi/ic_notification_full_node.png
deleted file mode 100644
index 0b1cf07..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_notification_full_node.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_notification_new_message.png b/app/src/main/res/drawable-xhdpi/ic_notification_new_message.png
deleted file mode 100644
index 5621edb..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_notification_new_message.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_plus_sign.png b/app/src/main/res/drawable-xhdpi/ic_plus_sign.png
deleted file mode 100755
index d320ebf..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_plus_sign.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi-v11/ic_notification_full_node.png b/app/src/main/res/drawable-xxhdpi-v11/ic_notification_full_node.png
deleted file mode 100644
index 9b736bf..0000000
Binary files a/app/src/main/res/drawable-xxhdpi-v11/ic_notification_full_node.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_close.png b/app/src/main/res/drawable-xxhdpi/ic_action_close.png
deleted file mode 100644
index 76de2b1..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_close.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_delete.png b/app/src/main/res/drawable-xxhdpi/ic_action_delete.png
deleted file mode 100755
index ef8e4bb..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_delete.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_mark_unread.png b/app/src/main/res/drawable-xxhdpi/ic_action_mark_unread.png
deleted file mode 100644
index 968b849..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_mark_unread.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_placeholder.png b/app/src/main/res/drawable-xxhdpi/ic_action_placeholder.png
deleted file mode 100644
index 55f33b9..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_placeholder.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_reply.png b/app/src/main/res/drawable-xxhdpi/ic_action_reply.png
deleted file mode 100755
index 15a3089..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_reply.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_send.png b/app/src/main/res/drawable-xxhdpi/ic_action_send.png
deleted file mode 100644
index d36f994..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_send.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_fab_compose_message.png b/app/src/main/res/drawable-xxhdpi/ic_fab_compose_message.png
deleted file mode 100644
index 40ae82a..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_fab_compose_message.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_notification_full_node.png b/app/src/main/res/drawable-xxhdpi/ic_notification_full_node.png
deleted file mode 100644
index 006b25e..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_notification_full_node.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_notification_new_message.png b/app/src/main/res/drawable-xxhdpi/ic_notification_new_message.png
deleted file mode 100644
index 2b218df..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_notification_new_message.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_plus_sign.png b/app/src/main/res/drawable-xxhdpi/ic_plus_sign.png
deleted file mode 100755
index 24e567d..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_plus_sign.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_delete.png b/app/src/main/res/drawable-xxxhdpi/ic_action_delete.png
deleted file mode 100755
index b664828..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_delete.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_reply.png b/app/src/main/res/drawable-xxxhdpi/ic_action_reply.png
deleted file mode 100755
index 2f08cc8..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_reply.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_plus_sign.png b/app/src/main/res/drawable-xxxhdpi/ic_plus_sign.png
deleted file mode 100755
index 491d801..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_plus_sign.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_action_archive.xml b/app/src/main/res/drawable/ic_action_archive.xml
new file mode 100644
index 0000000..899700e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_archive.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#DEFFFFFF"
+        android:pathData="M3,3H21V7H3V3M4,8H20V21H4V8M9.5,11A0.5,0.5 0,0 0,9 11.5V13H15V11.5A0.5,0.5 0,0 0,14.5 11H9.5Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_action_close.xml b/app/src/main/res/drawable/ic_action_close.xml
new file mode 100644
index 0000000..a9f3069
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_close.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#DEFFFFFF"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_action_compose_message.xml b/app/src/main/res/drawable/ic_action_compose_message.xml
new file mode 100644
index 0000000..fc450f7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_compose_message.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#DEFFFFFF"
+        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_action_mark_unread.xml b/app/src/main/res/drawable/ic_action_mark_unread.xml
new file mode 100644
index 0000000..d07b8cd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_mark_unread.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#DEFFFFFF"
+        android:pathData="M20,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V6c0,-1.1 -0.9,-2 -2,-2zm0,4l-8,5 -8,-5V6l8,5 8,-5v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_action_reply.xml b/app/src/main/res/drawable/ic_action_reply.xml
new file mode 100644
index 0000000..1cfa52c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_reply.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#DEFFFFFF"
+        android:pathData="M10,9V5L3,12L10,19V14.9C15,14.9 18.5,16.5 21,20C20,15 17,10 10,9Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_action_send.xml b/app/src/main/res/drawable/ic_action_send.xml
new file mode 100644
index 0000000..121d6e8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_send.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#DEFFFFFF"
+        android:pathData="M2,21L23,12L2,3V10L17,12L2,14V21Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_notification_full_node.xml b/app/src/main/res/drawable/ic_notification_full_node.xml
new file mode 100644
index 0000000..4790d6e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_notification_full_node.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19.35,10.03C18.67,6.59 15.64,4 12,4C9.11,4 6.6,5.64 5.35,8.03C2.34,8.36 0,10.9 0,14A6,6 0,0 0,6 20H19A5,5 0,0 0,24 15C24,12.36 21.95,10.22 19.35,10.03Z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_message_list.xml b/app/src/main/res/layout/fragment_message_list.xml
index cd73e5b..ba540ad 100644
--- a/app/src/main/res/layout/fragment_message_list.xml
+++ b/app/src/main/res/layout/fragment_message_list.xml
@@ -22,7 +22,7 @@
             android:id="@+id/fab_compose_message"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ic_fab_compose_message"
+            android:src="@drawable/ic_action_compose_message"
             app:elevation="8dp"
             android:layout_alignParentBottom="true"
             android:layout_alignParentEnd="true"
diff --git a/app/src/main/res/layout/fragment_subscribtions.xml b/app/src/main/res/layout/fragment_subscribtions.xml
index cd73e5b..ba540ad 100644
--- a/app/src/main/res/layout/fragment_subscribtions.xml
+++ b/app/src/main/res/layout/fragment_subscribtions.xml
@@ -22,7 +22,7 @@
             android:id="@+id/fab_compose_message"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ic_fab_compose_message"
+            android:src="@drawable/ic_action_compose_message"
             app:elevation="8dp"
             android:layout_alignParentBottom="true"
             android:layout_alignParentEnd="true"
diff --git a/app/src/main/res/layout/toolbar_layout.xml b/app/src/main/res/layout/toolbar_layout.xml
index 049a0b0..ade8b53 100644
--- a/app/src/main/res/layout/toolbar_layout.xml
+++ b/app/src/main/res/layout/toolbar_layout.xml
@@ -1,34 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
-        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"
-        android:fitsSystemWindows="true">
+<android.support.design.widget.CoordinatorLayout 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"
+    android:fitsSystemWindows="true">
 
     <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                 xmlns:tools="http://schemas.android.com/tools"
-                 android:layout_below="@id/toolbar"
-                 android:id="@+id/content"
-                 android:layout_width="match_parent"
-                 android:layout_height="match_parent"
-                 tools:context=".MessageListActivity"
-                 tools:layout="@android:layout/list_content"
-                 app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+        xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/toolbar"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        tools:context=".MessageListActivity"
+        tools:layout="@android:layout/list_content" />
 
     <android.support.design.widget.AppBarLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
         <android.support.v7.widget.Toolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:background="?attr/colorPrimary"
-                android:elevation="4dp"
-                android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-                app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-                app:layout_scrollFlags="scroll|enterAlways"/>
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            android:elevation="4dp"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+            app:layout_scrollFlags="scroll|enterAlways"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
 
     </android.support.design.widget.AppBarLayout>
 
diff --git a/app/src/main/res/menu/message.xml b/app/src/main/res/menu/message.xml
index aee2121..dc31fc3 100644
--- a/app/src/main/res/menu/message.xml
+++ b/app/src/main/res/menu/message.xml
@@ -5,21 +5,21 @@
     <item
             android:id="@+id/reply"
             app:showAsAction="ifRoom"
-            android:icon="@drawable/ic_action_placeholder"
+            android:icon="@drawable/ic_action_reply"
             android:title="@string/reply"/>
     <item
             android:id="@+id/delete"
             app:showAsAction="ifRoom"
-            android:icon="@drawable/ic_action_placeholder"
+            android:icon="@drawable/ic_action_delete"
             android:title="@string/delete"/>
     <item
             android:id="@+id/mark_unread"
             app:showAsAction="ifRoom"
-            android:icon="@drawable/ic_action_placeholder"
+            android:icon="@drawable/ic_action_mark_unread"
             android:title="@string/mark_unread"/>
     <item
             android:id="@+id/archive"
             app:showAsAction="ifRoom"
-            android:icon="@drawable/ic_action_placeholder"
+            android:icon="@drawable/ic_action_archive"
             android:title="@string/archive"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/message_list.xml b/app/src/main/res/menu/message_list.xml
index 75f182b..295a7e1 100644
--- a/app/src/main/res/menu/message_list.xml
+++ b/app/src/main/res/menu/message_list.xml
@@ -5,7 +5,7 @@
     <item
             android:id="@+id/empty_trash"
             app:showAsAction="never"
-            android:icon="@drawable/ic_action_placeholder"
+            android:icon="@drawable/ic_action_delete"
             android:title="@string/empty_trash"
             android:visible="false"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 8cbeca3..eb1f6e8 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,6 +3,7 @@
 <resources>
   <color name="primary">#FFC107</color>
   <color name="primary_dark">#FFA000</color>
+  <color name="primary_dark_text">#DEFFFFFF</color>
   <color name="primary_light">#FFECB3</color>
   <color name="accent">#607D8B</color>
   <color name="primary_text">#212121</color>
diff --git a/build.gradle b/build.gradle
index 37a428b..8eb7947 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:1.4.+'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files