diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 2bcd75a5..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 2bcd75a5..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 2bcd75a5..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 2bcd75a5..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 2bcd75a5..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/drawable/fab_compose.png b/app/src/main/res/drawable/fab_compose.png
deleted file mode 100644
index 0d6f4cf5..00000000
Binary files a/app/src/main/res/drawable/fab_compose.png and /dev/null differ
diff --git a/app/src/main/res/drawable/fab_search.png b/app/src/main/res/drawable/fab_search.png
deleted file mode 100644
index a2e21291..00000000
Binary files a/app/src/main/res/drawable/fab_search.png and /dev/null differ
diff --git a/app/src/main/res/drawable/fab_top.png b/app/src/main/res/drawable/fab_top.png
deleted file mode 100644
index 98a7415d..00000000
Binary files a/app/src/main/res/drawable/fab_top.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_arrow_upward_white_48px.xml b/app/src/main/res/drawable/ic_arrow_upward_white_48px.xml
new file mode 100644
index 00000000..92bfb15d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_upward_white_48px.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="21.0"
+    android:viewportWidth="21.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="m2.5,10.5 l1.41,1.41 5.59,-5.58 0,12.17 2,0 0,-12.17 5.58,5.59 1.42,-1.42 -8,-8 -8,8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_atsign.xml b/app/src/main/res/drawable/ic_atsign.xml
new file mode 100644
index 00000000..d6830618
--- /dev/null
+++ b/app/src/main/res/drawable/ic_atsign.xml
@@ -0,0 +1,7 @@
+<vector android:height="24dp" android:viewportHeight="21.0"
+    android:viewportWidth="21.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="1" android:fillColor="#ffffff"
+        android:pathData="m20.057,10.205q-0.139,2.406 -1.429,3.801 -1.29,1.386 -3.497,1.386 -2.103,0 -2.812,-1.482 -0.593,0.731 -1.383,1.097 -0.778,0.366 -1.638,0.366 -1.696,0 -2.579,-1.155Q5.847,13.064 6.056,11.129 6.242,9.561 6.974,8.3 7.717,7.039 8.845,6.356 9.983,5.663 11.261,5.663q0.976,0 1.72,0.202 0.755,0.202 1.766,0.837l-0.604,5.418q-0.221,1.905 1.325,1.905 1.185,0 1.94,-1.049 0.767,-1.059 0.837,-2.733 0.198,-3.551 -1.661,-5.437 -1.847,-1.886 -5.565,-1.886 -2.277,0 -4.043,0.943Q5.219,4.806 4.185,6.596 3.151,8.377 3.047,10.658q-0.139,2.319 0.662,4.003 0.813,1.675 2.475,2.55 1.673,0.876 4.078,0.876 0.976,0 2.033,-0.192 1.069,-0.192 1.813,-0.52l0.442,1.318q-0.709,0.385 -1.917,0.616 -1.197,0.241 -2.417,0.241 -2.951,0 -5.066,-1.039Q3.035,17.481 1.978,15.518 0.886,13.487 1.013,10.658 1.153,8.021 2.443,5.923 3.732,3.815 5.963,2.651 8.205,1.486 11.064,1.486q2.893,0 4.973,1.059 2.091,1.049 3.125,3.031 1.034,1.973 0.895,4.629zM8.333,11.129q-0.151,1.309 0.279,1.992 0.43,0.674 1.371,0.674 0.627,0 1.185,-0.452 0.558,-0.462 0.906,-1.261l0.523,-4.744q-0.581,-0.183 -1.127,-0.183 -1.29,0 -2.103,1.01 -0.813,1.001 -1.034,2.964z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_launcher.xml b/app/src/main/res/drawable/ic_launcher.xml
new file mode 100644
index 00000000..4d66007f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher.xml
@@ -0,0 +1,6 @@
+<vector android:height="24dp" android:viewportHeight="20.0"
+    android:viewportWidth="20.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="1" android:fillColor="#207be6"
+        android:pathData="M10,10m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0" android:strokeColor="#00000000"/>
+    <path android:fillColor="#fafafa" android:pathData="M11.337,14.123C11.06,13.736 10.626,13.13 10.374,12.778 10.117,12.418 9.908,12.138 9.897,12.138c-0.011,-0 -0.416,0.544 -0.958,1.287 -0.516,0.708 -0.942,1.288 -0.948,1.288 -0.015,0 -1.86,-1.3 -1.865,-1.313 -0.002,-0.007 0.415,-0.619 0.927,-1.361 0.512,-0.742 0.931,-1.36 0.931,-1.375 0,-0.023 -0.166,-0.081 -1.468,-0.515C5.71,9.879 5.042,9.656 5.032,9.652 5.019,9.647 5.095,9.389 5.359,8.558 5.549,7.959 5.708,7.465 5.713,7.459c0.005,-0.006 0.707,0.219 1.559,0.499 0.852,0.28 1.557,0.51 1.565,0.51 0.009,-0 0.019,-0.013 0.022,-0.029 0.003,-0.016 0.011,-0.742 0.016,-1.613 0.006,-0.871 0.015,-1.591 0.021,-1.6 0.008,-0.013 0.248,-0.016 1.127,-0.016 0.614,0 1.123,0.004 1.13,0.01 0.01,0.007 0.027,0.485 0.055,1.561 0.046,1.766 0.047,1.79 0.075,1.79 0.011,0 0.686,-0.226 1.501,-0.502 0.815,-0.276 1.485,-0.498 1.49,-0.492 0.016,0.019 0.685,2.194 0.676,2.202 -0.004,0.004 -0.684,0.237 -1.511,0.517 -1.137,0.385 -1.504,0.514 -1.507,0.531 -0.002,0.012 0.389,0.596 0.886,1.324 0.489,0.716 0.888,1.308 0.886,1.314 -0.005,0.015 -1.836,1.364 -1.852,1.364 -0.006,0 -0.239,-0.317 -0.516,-0.705z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_mode_edit_white_48px.xml b/app/src/main/res/drawable/ic_mode_edit_white_48px.xml
new file mode 100644
index 00000000..a7b5fa79
--- /dev/null
+++ b/app/src/main/res/drawable/ic_mode_edit_white_48px.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" 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_search_white_48px.xml b/app/src/main/res/drawable/ic_search_white_48px.xml
new file mode 100644
index 00000000..13b7e484
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search_white_48px.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="21.0"
+    android:viewportWidth="21.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="m14,12.755 l-0.79,0 -0.28,-0.27c0.98,-1.14 1.57,-2.62 1.57,-4.23 0,-3.59 -2.91,-6.5 -6.5,-6.5 -3.59,0 -6.5,2.91 -6.5,6.5 0,3.59 2.91,6.5 6.5,6.5 1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28 0,0.79 5,4.99 1.49,-1.49 -4.99,-5zM8,12.755c-2.49,0 -4.5,-2.01 -4.5,-4.5 0,-2.49 2.01,-4.5 4.5,-4.5 2.49,0 4.5,2.01 4.5,4.5 0,2.49 -2.01,4.5 -4.5,4.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_stream.xml b/app/src/main/res/drawable/ic_stream.xml
new file mode 100644
index 00000000..0050d519
--- /dev/null
+++ b/app/src/main/res/drawable/ic_stream.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="14.0"
+    android:viewportWidth="14.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#fafafa" android:pathData="m8.307,11.295c-0.278,-0.388 -0.711,-0.993 -0.963,-1.345 -0.257,-0.36 -0.467,-0.64 -0.478,-0.641 -0.011,-0 -0.416,0.544 -0.958,1.287 -0.516,0.708 -0.942,1.288 -0.948,1.288 -0.015,0 -1.86,-1.3 -1.865,-1.313 -0.002,-0.007 0.415,-0.619 0.927,-1.361 0.512,-0.742 0.931,-1.36 0.931,-1.375 0,-0.023 -0.166,-0.081 -1.468,-0.515 -0.807,-0.269 -1.476,-0.492 -1.485,-0.496 -0.013,-0.005 0.063,-0.262 0.327,-1.094 0.19,-0.598 0.349,-1.092 0.354,-1.098 0.005,-0.006 0.707,0.219 1.559,0.499 0.852,0.28 1.557,0.51 1.565,0.51 0.009,-0 0.019,-0.013 0.022,-0.029 0.003,-0.016 0.011,-0.742 0.016,-1.613 0.006,-0.871 0.015,-1.591 0.021,-1.6 0.008,-0.013 0.248,-0.016 1.127,-0.016 0.614,0 1.123,0.004 1.13,0.01 0.01,0.007 0.027,0.485 0.055,1.561 0.046,1.766 0.047,1.79 0.075,1.79 0.011,0 0.686,-0.226 1.501,-0.502 0.815,-0.276 1.485,-0.498 1.49,-0.492 0.016,0.019 0.685,2.194 0.676,2.202 -0.004,0.004 -0.684,0.237 -1.511,0.517 -1.137,0.385 -1.504,0.514 -1.507,0.531 -0.002,0.012 0.389,0.596 0.886,1.324 0.489,0.716 0.888,1.308 0.886,1.314C10.67,10.651 8.839,12 8.823,12c-0.006,0 -0.239,-0.317 -0.516,-0.705z"/>
+</vector>
diff --git a/app/src/main/res/drawable/jb_mentions.png b/app/src/main/res/drawable/jb_mentions.png
deleted file mode 100644
index d1a2f181..00000000
Binary files a/app/src/main/res/drawable/jb_mentions.png and /dev/null differ
diff --git a/app/src/main/res/drawable/jb_stream.png b/app/src/main/res/drawable/jb_stream.png
deleted file mode 100644
index 78cbc780..00000000
Binary files a/app/src/main/res/drawable/jb_stream.png and /dev/null differ
diff --git a/app/src/main/res/menu/main__menu_bottom.xml b/app/src/main/res/menu/main__menu_bottom.xml
index 9ed22043..002a2a29 100644
--- a/app/src/main/res/menu/main__menu_bottom.xml
+++ b/app/src/main/res/menu/main__menu_bottom.xml
@@ -6,14 +6,14 @@
 
     <item
         android:id="@+id/action_search"
-        android:icon="@drawable/fab_search"
+        android:icon="@drawable/ic_search_white_48px"
         app:showAsAction="always"
         android:title="@string/action_search_by_tags_or_persons" />
 
 
     <item
         android:id="@+id/action_compose"
-        android:icon="@drawable/fab_compose"
+        android:icon="@drawable/ic_mode_edit_white_48px"
         app:showAsAction="always"
         android:title="@string/action_compose_new_post" />
 
@@ -31,7 +31,7 @@
     <!-- Keep right most -->
     <item
         android:id="@+id/action_go_to_top"
-        android:icon="@drawable/fab_top"
+        android:icon="@drawable/ic_arrow_upward_white_48px"
         android:title="@string/action_go_to_top"
         app:showAsAction="always"/>
 
diff --git a/app/src/main/res/menu/main__navdrawer.xml b/app/src/main/res/menu/main__navdrawer.xml
index 6ae0d7a3..25a2f7a9 100644
--- a/app/src/main/res/menu/main__navdrawer.xml
+++ b/app/src/main/res/menu/main__navdrawer.xml
@@ -4,7 +4,7 @@
     <group android:checkableBehavior="none">
         <item
             android:id="@+id/nav_stream"
-            android:icon="@drawable/jb_stream"
+            android:icon="@drawable/ic_stream"
             android:title="@string/nav_stream" />
 
         <item
@@ -38,7 +38,7 @@
 
         <item
             android:id="@+id/nav_mentions"
-            android:icon="@drawable/jb_mentions"
+            android:icon="@drawable/ic_atsign"
             android:title="@string/nav_mentions" />
 
         <item
diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml
index 29bb3179..28f1e010 100644
--- a/app/src/main/res/values/color.xml
+++ b/app/src/main/res/values/color.xml
@@ -5,9 +5,9 @@
     <color name="colorAccent">@color/accent</color>
 
     <!-- Colors from Palette -->
-    <color name="primary">#3F51B5</color>
-    <color name="primary_dark">#303F9F</color>
-    <color name="primary_light">#C5CAE9</color>
+    <color name="primary">#207be6</color>
+    <color name="primary_dark">#195ed2</color>
+    <color name="primary_light">#BBDEFB</color>
     <color name="accent">#FF5300</color>
     <color name="primary_text">#212121</color>
     <color name="secondary_text">#727272</color>