From 86f8bf3c2fd9e0dbe0991da35459c92b6b8f06ed Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 8 Mar 2017 21:07:49 +0100
Subject: [PATCH] Fix some visual bugs

---
 .../res/drawable/account_header_missing.xml   |  3 +-
 app/src/main/res/drawable/ic_back.xml         |  7 -----
 app/src/main/res/drawable/ic_compose.xml      | 11 -------
 app/src/main/res/drawable/ic_extra.xml        |  7 -----
 app/src/main/res/drawable/ic_favourite.xml    |  7 -----
 app/src/main/res/drawable/ic_favourited.xml   |  7 -----
 app/src/main/res/drawable/ic_followed.xml     |  7 -----
 app/src/main/res/drawable/ic_lock_24dp.xml    |  9 ------
 app/src/main/res/drawable/ic_media.xml        | 31 -------------------
 .../main/res/drawable/ic_media_disabled.xml   | 11 -------
 .../main/res/drawable/ic_notify_mention.xml   | 11 -------
 app/src/main/res/drawable/ic_options.xml      |  7 -----
 .../res/drawable/ic_person_outline_24dp.xml   |  9 ------
 app/src/main/res/drawable/ic_reblog.xml       |  7 -----
 .../main/res/drawable/ic_reblog_disabled.xml  |  7 -----
 app/src/main/res/drawable/ic_reblogged.xml    |  7 -----
 app/src/main/res/drawable/ic_reply.xml        |  7 -----
 app/src/main/res/layout/item_account.xml      | 12 +++++--
 app/src/main/res/layout/tab_main.xml          | 14 ---------
 .../main/res/transition/activity_slide.xml    |  3 --
 20 files changed, 10 insertions(+), 174 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_back.xml
 delete mode 100644 app/src/main/res/drawable/ic_compose.xml
 delete mode 100644 app/src/main/res/drawable/ic_extra.xml
 delete mode 100644 app/src/main/res/drawable/ic_favourite.xml
 delete mode 100644 app/src/main/res/drawable/ic_favourited.xml
 delete mode 100644 app/src/main/res/drawable/ic_followed.xml
 delete mode 100644 app/src/main/res/drawable/ic_lock_24dp.xml
 delete mode 100644 app/src/main/res/drawable/ic_media.xml
 delete mode 100644 app/src/main/res/drawable/ic_media_disabled.xml
 delete mode 100644 app/src/main/res/drawable/ic_notify_mention.xml
 delete mode 100644 app/src/main/res/drawable/ic_options.xml
 delete mode 100644 app/src/main/res/drawable/ic_person_outline_24dp.xml
 delete mode 100644 app/src/main/res/drawable/ic_reblog.xml
 delete mode 100644 app/src/main/res/drawable/ic_reblog_disabled.xml
 delete mode 100644 app/src/main/res/drawable/ic_reblogged.xml
 delete mode 100644 app/src/main/res/drawable/ic_reply.xml
 delete mode 100644 app/src/main/res/layout/tab_main.xml
 delete mode 100644 app/src/main/res/transition/activity_slide.xml

diff --git a/app/src/main/res/drawable/account_header_missing.xml b/app/src/main/res/drawable/account_header_missing.xml
index 0567c24b..51629946 100644
--- a/app/src/main/res/drawable/account_header_missing.xml
+++ b/app/src/main/res/drawable/account_header_missing.xml
@@ -2,7 +2,6 @@
 <shape
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-
+    <size android:width="700px" android:height="335px" />
     <solid android:color="@color/color_background_dark" />
-
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
deleted file mode 100644
index cceab543..00000000
--- a/app/src/main/res/drawable/ic_back.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="850.3937"
-    android:viewportWidth="850.3937" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
-        android:pathData="m410.4,48.8c-9.1,0 -18.1,3.5 -25.1,10.4L84.7,359.9c-1.6,1.6 -2.9,3.2 -4.1,5 -6,6.3 -9.7,14.9 -9.7,24.4l0,70.9c0,11.3 5.2,21.3 13.4,27.8 1.6,3.2 3.8,6.2 6.5,8.9L391.5,797.5c13.9,13.9 36.2,13.9 50.1,0l50.1,-50.1c13.9,-13.9 13.9,-36.2 0,-50.1l-201.7,-201.7 454.1,0c19.6,0 35.4,-15.8 35.4,-35.4l0,-70.9c0,-19.6 -15.8,-35.4 -35.4,-35.4l-452.9,0 194.4,-194.4c13.9,-13.9 13.9,-36.2 0,-50.1l-50.1,-50.1c-6.9,-6.9 -16,-10.4 -25.1,-10.4z"
-        android:strokeAlpha="1" android:strokeColor="#00000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="round" android:strokeWidth="10.62992096"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_compose.xml b/app/src/main/res/drawable/ic_compose.xml
deleted file mode 100644
index c5669bb7..00000000
--- a/app/src/main/res/drawable/ic_compose.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="708.66144"
-    android:viewportWidth="708.66144" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
-        android:pathData="m86.4,17.7c-37.3,0 -67.3,30 -67.3,67.3l0,538.6c0,37.3 30,67.3 67.3,67.3l537.2,0c37.3,0 67.3,-30 67.3,-67.3l0,-462.4c-17.6,17.9 -35.4,35.6 -53.2,53.3l0,352.4c0,39.3 -31.6,70.9 -70.9,70.9l-425.2,0c-39.3,0 -70.9,-31.6 -70.9,-70.9l0,-425.2c0,-39.3 31.6,-70.9 70.9,-70.9l358.9,0c18,-17.7 36,-35.3 53.8,-53.2l-468,0z"
-        android:strokeAlpha="1" android:strokeColor="#ffffff"
-        android:strokeLineCap="butt" android:strokeLineJoin="round" android:strokeWidth="33.62945938"/>
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
-        android:pathData="m672.8,8.2 l25.1,25.1c13.9,13.9 13.9,36.2 0,50.1L361.6,420.4C347.1,434.2 199.5,537.2 185.6,523.3l-0.8,-0.8C170.9,508.6 272.1,359.2 286.6,344.7L622.7,8.2c13.9,-13.9 36.2,-13.9 50.1,0z"
-        android:strokeAlpha="1" android:strokeColor="#cccccc"
-        android:strokeLineCap="butt" android:strokeLineJoin="round" android:strokeWidth="0"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_extra.xml b/app/src/main/res/drawable/ic_extra.xml
deleted file mode 100644
index 62fddb87..00000000
--- a/app/src/main/res/drawable/ic_extra.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="42.519684"
-    android:viewportWidth="42.519684" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
-        android:pathData="M7.81,16.57C7.36,16.55 6.87,16.73 6.43,17.17C6.27,17.34 6.13,17.51 5.99,17.68C5.86,17.79 5.73,17.91 5.63,18.04C5.49,18.21 5.4,18.42 5.29,18.62C5.29,18.62 5.29,18.63 5.28,18.63C5.04,19 4.81,19.37 4.6,19.76C4.1,20.87 3.96,22.05 4.07,23.25C4.23,24.34 4.77,25.2 5.58,25.93C6.51,26.7 7.61,26.67 8.71,26.34C9.63,26.03 10.41,25.46 11.14,24.84C11.78,24.32 12.3,23.72 12.71,23.01C13.13,22.11 13.19,21.16 13.02,20.2C12.92,19.29 12.36,18.64 11.77,18.01C11.12,17.34 10.29,17.03 9.38,16.89C9.15,16.86 8.91,16.84 8.68,16.85C8.42,16.68 8.13,16.58 7.81,16.57zM22.36,16.9C21.94,16.96 21.57,17.11 21.23,17.31C20.89,17.38 20.54,17.55 20.21,17.88C19.3,18.75 18.74,19.9 18.28,21.05C17.88,22.29 17.95,23.52 18.34,24.73C18.78,25.83 19.59,26.53 20.69,26.93C21.86,27.26 22.88,26.85 23.82,26.15C24.66,25.41 25.2,24.46 25.56,23.41C25.93,22.47 26.06,21.49 26.01,20.48C25.99,19.54 25.59,18.73 25.04,17.99C24.3,17.13 23.45,16.9 22.36,16.9zM35.14,17.19C34.99,17.2 34.86,17.24 34.73,17.28C34.26,17.25 33.75,17.42 33.29,17.88C32.46,18.61 31.87,19.5 31.43,20.52C31.01,21.82 31.15,23.13 31.64,24.39C32.06,25.39 32.78,26.08 33.75,26.53C35.12,26.87 35.98,26.36 36.91,25.4C37.5,24.76 37.97,24.04 38.36,23.26C38.82,22.34 38.9,21.37 38.77,20.37C38.61,19.46 38.13,18.74 37.49,18.11C37.03,17.63 36.44,17.38 35.81,17.23C35.56,17.19 35.34,17.18 35.14,17.19zM8.68,21.7C8.7,21.72 8.72,21.73 8.74,21.75C8.63,21.69 8.89,22.06 8.69,21.73C8.68,21.72 8.68,21.71 8.68,21.7zM35.02,23.23C35.03,23.23 35.03,23.24 35.04,23.24C35.28,23.41 35.15,23.37 35.02,23.23z"
-        android:strokeAlpha="1" android:strokeColor="#00000000"
-        android:strokeLineCap="square" android:strokeLineJoin="miter" android:strokeWidth="0.30000001"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_favourite.xml b/app/src/main/res/drawable/ic_favourite.xml
deleted file mode 100644
index 24478b8b..00000000
--- a/app/src/main/res/drawable/ic_favourite.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="42.519684"
-    android:viewportWidth="42.519684" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
-        android:pathData="M21.68,5.81C20.21,5.78 17.68,14.98 16.48,15.81C15.27,16.65 5.77,15.82 5.29,17.2C4.81,18.59 12.77,23.84 13.2,25.24C13.62,26.64 9.89,35.42 11.06,36.3C12.23,37.19 19.68,31.24 21.14,31.27C22.61,31.3 29.81,37.56 31.01,36.72C32.21,35.88 28.86,26.96 29.34,25.57C29.82,24.19 37.99,19.28 37.57,17.88C37.15,16.47 27.62,16.91 26.45,16.02C25.29,15.14 23.14,5.84 21.68,5.81z"
-        android:strokeAlpha="1" android:strokeColor="#00000000"
-        android:strokeLineCap="square" android:strokeLineJoin="miter" android:strokeWidth="0.30000001"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_favourited.xml b/app/src/main/res/drawable/ic_favourited.xml
deleted file mode 100644
index fe780bc2..00000000
--- a/app/src/main/res/drawable/ic_favourited.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector android:height="16dp" android:viewportHeight="566.92914"
-    android:viewportWidth="566.92914" android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
-        android:pathData="M141.7,0C63.2,0 0,63.2 0,141.7L0,425.2C0,503.7 63.2,566.9 141.7,566.9L425.2,566.9C503.7,566.9 566.9,503.7 566.9,425.2L566.9,141.7C566.9,63.2 503.7,0 425.2,0L141.7,0zM283.6,24.8C287.6,24.9 291.2,27.1 293,30.7L363.4,173.4L520.9,196.3C529.6,197.6 533.1,208.3 526.8,214.4L412.8,325.5L439.7,482.3C441.2,491 432.1,497.6 424.3,493.5L283.5,419.5L142.6,493.5C134.8,497.6 125.7,491 127.2,482.3L154.1,325.5L40.2,214.4C33.8,208.3 37.3,197.6 46,196.3L203.5,173.4L273.9,30.7C275.7,27.1 279.5,24.8 283.6,24.8z"
-        android:strokeAlpha="1" android:strokeColor="#00000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="round" android:strokeWidth="0"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_followed.xml b/app/src/main/res/drawable/ic_followed.xml
deleted file mode 100644
index bdef7ee8..00000000
--- a/app/src/main/res/drawable/ic_followed.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector android:height="16dp" android:viewportHeight="566.92914"
-    android:viewportWidth="566.92914" android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
-        android:pathData="M141.7,0C63.2,0 0,63.2 0,141.7L0,425.2C0,503.7 63.2,566.9 141.7,566.9L425.2,566.9C503.7,566.9 566.9,503.7 566.9,425.2L566.9,141.7C566.9,63.2 503.7,0 425.2,0L141.7,0zM283.5,70.9A88.6,88.6 0,0 1,372 159.4A88.6,88.6 0,0 1,283.5 248A88.6,88.6 0,0 1,194.9 159.4A88.6,88.6 0,0 1,283.5 70.9zM194.9,311.3C194.9,311.3 229.1,336.6 283.5,336.6C338.4,336.6 370.5,311.3 370.5,311.3C496.1,407.5 460.6,478.3 460.6,478.3L106.3,478.3C106.3,478.3 70.9,407.5 194.9,311.3z"
-        android:strokeAlpha="1" android:strokeColor="#9d9d9d"
-        android:strokeLineCap="butt" android:strokeLineJoin="round" android:strokeWidth="0"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_lock_24dp.xml b/app/src/main/res/drawable/ic_lock_24dp.xml
deleted file mode 100644
index 6316164d..00000000
--- a/app/src/main/res/drawable/ic_lock_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="@color/toolbar_icon_dark"
-        android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_media.xml b/app/src/main/res/drawable/ic_media.xml
deleted file mode 100644
index ee873111..00000000
--- a/app/src/main/res/drawable/ic_media.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<vector android:height="48dp" android:viewportHeight="1133.894"
-    android:viewportWidth="1134.6519" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#00000000"
-        android:pathData="M52.7,262.2L1081.9,262.2A38.6,38.6 0,0 1,1120.5 300.8L1120.5,833.1A38.6,38.6 0,0 1,1081.9 871.7L52.7,871.7A38.6,38.6 0,0 1,14.2 833.1L14.2,300.8A38.6,38.6 0,0 1,52.7 262.2z"
-        android:strokeAlpha="1" android:strokeColor="#ffffff"
-        android:strokeLineCap="butt" android:strokeLineJoin="round" android:strokeWidth="28.34645653"/>
-    <path android:fillAlpha="1" android:fillColor="#00000000"
-        android:pathData="m19.6,458.3c104.2,-9.7 76.2,61 365.2,125.3 61.9,13.8 50,40.6 96.2,58 105.8,39.9 376.7,15.8 639.8,33.5"
-        android:strokeAlpha="1" android:strokeColor="#ffffff"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="28.34645653"/>
-    <path android:fillAlpha="1" android:fillColor="#00000000"
-        android:pathData="m1011.8,494c0,0 -130.5,-8 -158.9,-39.2 -142.4,-156.4 -193.3,0.9 -217,-9.7 -74.7,-33.3 -65,21.3 -199.8,103.2 -20.5,12.4 -8.8,16.9 39.1,18.1 143.3,3.8 -74.6,16.2 24.6,18.4l115.8,2.6"
-        android:strokeAlpha="1" android:strokeColor="#ffffff"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="28.34645653"/>
-    <path android:fillAlpha="1" android:fillColor="#00000000"
-        android:pathData="m1121.2,496.7c0,0 -254.5,-33.7 -505.7,90.3 -98.7,48.8 350.1,80.7 350.1,80.7"
-        android:strokeAlpha="1" android:strokeColor="#ffffff"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="28.34645653"/>
-    <path android:fillColor="#00000000"
-        android:pathData="m459,531.9 l-245.5,-0" android:strokeAlpha="1"
-        android:strokeColor="#ffffff" android:strokeLineCap="butt"
-        android:strokeLineJoin="miter" android:strokeWidth="28.34645653"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M14.2,639C390.1,602 473.1,743.8 1118.5,752.1"
-        android:strokeAlpha="1" android:strokeColor="#ffffff"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="35.43307114"/>
-    <path android:fillAlpha="1" android:fillColor="#00000000"
-        android:pathData="M277.5,425.5m-62.9,0a62.9,62.9 0,1 1,125.7 0a62.9,62.9 0,1 1,-125.7 0"
-        android:strokeAlpha="1" android:strokeColor="#ffffff"
-        android:strokeLineCap="butt" android:strokeLineJoin="round" android:strokeWidth="35.43307114"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_media_disabled.xml b/app/src/main/res/drawable/ic_media_disabled.xml
deleted file mode 100644
index 9c1a90e9..00000000
--- a/app/src/main/res/drawable/ic_media_disabled.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector android:height="48dp" android:viewportHeight="1133.894"
-    android:viewportWidth="1134.6519" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#9d9d9d"
-        android:pathData="m277.5,344.9c-44.3,0 -80.6,36.3 -80.6,80.6 -0,44.3 36.3,80.6 80.6,80.6 44.3,0 80.6,-36.3 80.6,-80.6 -0,-44.3 -36.3,-80.6 -80.6,-80.6zM277.5,380.3c25.1,0 45.1,20 45.1,45.1 0,25.1 -20,45.1 -45.1,45.1 -25.1,0 -45.1,-20 -45.1,-45.1 0,-25.1 20,-45.1 45.1,-45.1zM135.7,615.2c-38,-0.1 -78.6,1.8 -123.2,6.2l-0.1,35.3 306.3,31.4 2.1,-20.4c4.8,0.8 9.6,1.5 14.4,2.4l6.3,-34.9c-65,-11.8 -130.2,-19.8 -205.8,-20zM549.6,676.1 L549.2,679.4 542.6,712.8c135.7,27.1 307.8,53.6 575.7,57.1l2,-35.3 -570.7,-58.5zM213.5,517.8 L213.5,546.1 459,546.1 459,517.8 213.5,517.8zM1034.5,478.4c-83.3,0.3 -215.7,11.2 -354.9,65.1l10.2,26.4c134.7,-52.1 263.8,-62.9 344.7,-63.2 53,-0.2 84.7,4.1 84.7,4.1l3.7,-28.1c0,0 -34,-4.5 -88.6,-4.3zM628.4,605.1 L618,631.5c43.4,17 128.1,28.6 204.3,37.2 76.1,8.6 142.3,13.3 142.3,13.3l2,-28.3c0,0 -65.7,-4.7 -141.1,-13.2 -75.4,-8.5 -161.9,-21.6 -197.1,-35.4zM828.5,411.3 L810.2,432.9c10,8.5 20.8,18.8 32.2,31.4 10.5,11.6 25.7,17.8 43,23.3 14.5,4.6 30.4,7.9 46.1,10.7l-269,63.5 6.5,27.6 346,-81.6 -2.4,-27.9c0,0 -32,-2 -67.4,-7.7 -17.7,-2.9 -36.1,-6.7 -51.3,-11.5 -15.2,-4.8 -26.9,-11.3 -30.6,-15.3 -12.2,-13.4 -23.8,-24.6 -34.9,-34zM445.8,525.5c-5.4,3.5 -11.1,7.1 -17,10.7 -5.8,3.5 -10.5,5.8 -14.4,13.3 -2,3.8 -2.8,10.6 -0.3,15.7 2.5,5.1 6.3,7.4 9.3,8.8l9.1,4.5 31.1,-31.1 -17.7,-21.9zM37.7,443.2c-6.1,-0 -12.5,0.3 -19.4,1l2.6,28.2c6.1,-0.6 11.7,-0.8 16.8,-0.8 23.5,0 37.3,5.1 55.5,15l-0.1,-0.1c86.8,47.7 182.4,93.2 288.7,110.9 6.2,1.4 11.4,2.9 15.9,4.4l9.2,-26.8c-5.7,-1.9 -11.9,-3.7 -19.1,-5.3l-0.4,-0.1 -0.4,-0.1C285.7,552.8 192.7,508.9 106.9,461.7l-0,-0 -0,-0C86.5,450.7 65.9,443.2 37.7,443.2l-0,0zM652.9,568.5 L647.6,573.8 549.5,671.9 579.7,674.6c135,12.1 340.2,1.1 540.2,14.6l3.7,-28 -470.7,-92.7zM662.3,599.2 L941.1,654.1C817.5,652.1 701.5,654.1 612.8,648.7l49.4,-49.4zM52.7,248c-29,0 -52.7,23.8 -52.7,52.7l0,532.4c0,29 23.8,52.7 52.7,52.7l66.5,0a14.2,14.2 0,0 0,10 -4.2L738.7,272.2a14.2,14.2 0,0 0,-10 -24.2l-676,0zM979.2,248a14.2,14.2 0,0 0,-10 4.2L359.7,861.7a14.2,14.2 0,0 0,10 24.2l712.2,0c29,0 52.7,-23.8 52.7,-52.7l0,-532.4c0,-29 -23.8,-52.7 -52.7,-52.7l-102.7,0zM52.7,276.4 L694.5,276.4 113.3,857.5 52.7,857.5c-13.8,0 -24.4,-10.6 -24.4,-24.4l0,-532.4c0,-13.8 10.6,-24.4 24.4,-24.4zM985.1,276.4 L1081.9,276.4c13.8,0 24.4,10.6 24.4,24.4l0,532.4c0,13.8 -10.6,24.4 -24.4,24.4l-677.9,0 581.1,-581.1z"
-        android:strokeAlpha="1" android:strokeColor="#00000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="round" android:strokeWidth="35.43307114"/>
-    <path android:fillAlpha="1" android:fillColor="#00000000"
-        android:pathData="M915.1,130.3L985.8,201.1A38.6,38.6 58.5,0 1,985.8 255.6L238.6,1002.8A38.6,38.6 84,0 1,184.1 1002.8L113.3,932.1A38.6,38.6 92.7,0 1,113.3 877.6L860.6,130.3A38.6,38.6 79.6,0 1,915.1 130.3z"
-        android:strokeAlpha="1" android:strokeColor="#9d9d9d"
-        android:strokeLineCap="butt" android:strokeLineJoin="round" android:strokeWidth="35.43307515"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_notify_mention.xml b/app/src/main/res/drawable/ic_notify_mention.xml
deleted file mode 100644
index 6ee8c1ce..00000000
--- a/app/src/main/res/drawable/ic_notify_mention.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="637.7953"
-    android:viewportWidth="637.7953" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
-        android:pathData="M638.4,462C518.5,688.5 338.4,648.4 266,598.8 159,525.6 124,422.3 242.9,288.3 455.8,48.3 302.5,13.2 302.5,13.2c0,0 182.3,30.4 27.3,256.1 -80.8,117.6 -110.4,189.8 -8,253.1 110,56.5 231,-61.9 257,-103z"
-        android:strokeAlpha="1" android:strokeColor="#00000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1"/>
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
-        android:pathData="m263.5,4.2c-41,12.5 -74,22 -103,59.8C60.4,194.3 29.6,305.7 128.9,407.1 251.6,489.6 425.3,370.6 425.3,370.6l38.5,66.6c0,0 -194.3,142.4 -338,52.1C79.6,460.2 -85.6,403.7 64.9,121.1 122.5,12.7 176.6,-10.9 263.5,4.2Z"
-        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_options.xml b/app/src/main/res/drawable/ic_options.xml
deleted file mode 100644
index b4f39bea..00000000
--- a/app/src/main/res/drawable/ic_options.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="1133.8583"
-    android:viewportWidth="1133.8583" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#00000000"
-        android:pathData="M704.8,566.9A137.9,137.9 0,0 1,566.9 704.8,137.9 137.9,0 0,1 429,566.9 137.9,137.9 0,0 1,566.9 429,137.9 137.9,0 0,1 704.8,566.9ZM566.9,1098.1c-184.7,0 -26,-116.8 -185.9,-209.2 -160,-92.4 -181.8,103.5 -274.1,-56.4 -92.4,-160 88.2,-80.9 88.2,-265.6 0,-184.7 -180.5,-105.6 -88.2,-265.6 92.4,-160 114.1,35.9 274.1,-56.4 160,-92.4 1.2,-209.2 185.9,-209.2 184.7,-0 26,116.8 185.9,209.2 160,92.4 181.8,-103.5 274.1,56.4 92.4,160 -88.2,80.9 -88.2,265.6 0,184.7 180.5,105.6 88.2,265.6C934.6,992.5 912.8,796.6 752.8,888.9 592.9,981.3 751.6,1098.1 566.9,1098.1Z"
-        android:strokeAlpha="1" android:strokeColor="#ffffff"
-        android:strokeLineCap="butt" android:strokeLineJoin="round" android:strokeWidth="68.95068359"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_person_outline_24dp.xml b/app/src/main/res/drawable/ic_person_outline_24dp.xml
deleted file mode 100644
index 4ad4f8d0..00000000
--- a/app/src/main/res/drawable/ic_person_outline_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="@color/toolbar_icon_dark"
-        android:pathData="M12,5.9c1.16,0 2.1,0.94 2.1,2.1s-0.94,2.1 -2.1,2.1S9.9,9.16 9.9,8s0.94,-2.1 2.1,-2.1m0,9c2.97,0 6.1,1.46 6.1,2.1v1.1L5.9,18.1L5.9,17c0,-0.64 3.13,-2.1 6.1,-2.1M12,4C9.79,4 8,5.79 8,8s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,13c-2.67,0 -8,1.34 -8,4v3h16v-3c0,-2.66 -5.33,-4 -8,-4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_reblog.xml b/app/src/main/res/drawable/ic_reblog.xml
deleted file mode 100644
index 3666855f..00000000
--- a/app/src/main/res/drawable/ic_reblog.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="42.519684"
-    android:viewportWidth="42.519684" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
-        android:pathData="m24.58,8.38c-0.38,0.01 -0.77,0.01 -1.15,0.02 -0.39,0.01 -0.78,0.01 -1.17,0.02 -0.4,0.01 -0.8,0.01 -1.2,0.02 -0.39,0.01 -0.79,0.02 -1.18,0.03 -0.38,0.01 -0.76,0.02 -1.15,0.03 -0.37,0.01 -0.74,0.02 -1.11,0.04 -0.34,0.01 -0.69,0.03 -1.03,0.04 -0.31,0.01 -0.63,0.03 -0.94,0.04 -0.3,0.01 -0.6,0.03 -0.9,0.05 -0.29,0.02 -0.58,0.04 -0.88,0.06 -0.27,0.02 -0.55,0.04 -0.82,0.06 -0.24,0.02 -0.47,0.04 -0.71,0.07 -0.16,0.02 -0.31,0.06 -0.47,0.07l0,0.01c-0.25,0 -0.2,3.54 0.05,3.54 0.13,-0.25 0.58,-0.15 0.99,-0.14 0.25,-0.03 0.5,-0.05 0.75,-0.07 0.28,-0.02 0.56,-0.04 0.83,-0.06 0.29,-0.02 0.59,-0.03 0.88,-0.05 0.3,-0.02 0.61,-0.03 0.91,-0.05 0.34,-0.02 0.67,-0.03 1.01,-0.04 0.36,-0.01 0.73,-0.02 1.09,-0.04 0.38,-0.01 0.76,-0.02 1.13,-0.03 0.39,-0.01 0.78,-0.02 1.17,-0.03 0.4,-0.01 0.79,-0.01 1.19,-0.02 0.39,-0.01 0.78,-0.01 1.17,-0.02 0.38,-0.01 0.77,-0.01 1.15,-0.02 0.35,-0.01 0.71,-0.01 1.06,-0.01 0.36,0.01 0.72,0.01 1.08,0.02 0.33,0.01 0.65,0.03 0.98,0.05 0.32,0.03 0.63,0.05 0.95,0.09 0.29,0.03 0.57,0.08 0.85,0.13 0.22,0.04 0.44,0.11 0.65,0.19 0.21,0.07 0.4,0.18 0.58,0.29 0.18,0.11 0.35,0.24 0.5,0.38 0.18,0.16 0.35,0.34 0.51,0.52 0.14,0.16 0.26,0.33 0.37,0.51 0.11,0.2 0.22,0.41 0.32,0.62 0.11,0.22 0.19,0.44 0.27,0.67 0.09,0.26 0.17,0.52 0.24,0.78 0.06,0.26 0.11,0.51 0.17,0.77 0.06,0.27 0.09,0.55 0.12,0.82 0.04,0.3 0.06,0.6 0.08,0.9 0.02,0.31 0.04,0.63 0.04,0.94 0,0.33 0.01,0.65 0.01,0.98 0,0.31 0.01,0.62 0.01,0.93l0.01,0.86c0,0.26 0,0.52 0.01,0.78 0.03,0.25 3.54,-0.23 3.5,-0.47 -0,-0.26 -0,-0.52 -0.01,-0.78l-0.01,-0.86c-0,-0.31 -0.01,-0.62 -0.01,-0.94 -0,-0.34 -0.01,-0.68 -0.02,-1.02 -0.01,-0.36 -0.04,-0.72 -0.06,-1.08 -0.03,-0.36 -0.07,-0.71 -0.12,-1.07 -0.05,-0.35 -0.11,-0.71 -0.19,-1.05 -0.07,-0.34 -0.15,-0.67 -0.25,-1 -0.1,-0.31 -0.19,-0.63 -0.31,-0.94 -0.12,-0.32 -0.25,-0.64 -0.4,-0.95 -0.15,-0.31 -0.31,-0.62 -0.5,-0.92 -0.2,-0.31 -0.42,-0.61 -0.67,-0.88 -0.24,-0.26 -0.49,-0.52 -0.75,-0.76C32.91,10.16 32.61,9.92 32.28,9.72 31.95,9.51 31.61,9.32 31.25,9.17 30.88,9.02 30.52,8.89 30.14,8.81 29.78,8.73 29.42,8.66 29.05,8.61 28.69,8.56 28.33,8.52 27.97,8.49c-0.38,-0.04 -0.76,-0.05 -1.14,-0.08 -0.36,-0.01 -0.72,-0.02 -1.09,-0.03 -0.39,-0.01 -0.77,-0.02 -1.16,-0.01zM8.94,10.1C8.9,10.03 8.31,9.3 8.31,9.3c0,0 -0.68,0.97 -0.71,1.03 -0.12,0.18 -0.24,0.36 -0.36,0.54 -0.08,0.12 -0.16,0.24 -0.25,0.36 -0.54,0.78 -0.64,0.88 -0.79,1.12 -0.07,0.1 -0.14,0.19 -0.21,0.29 -0.27,0.39 -0.55,0.77 -0.83,1.15 -0.28,0.38 -0.56,0.76 -0.85,1.12 -0.28,0.37 -0.55,0.73 -0.83,1.1 -0.25,0.33 -0.5,0.66 -0.76,0.99 -0.24,0.32 -0.48,0.63 -0.72,0.95 -0.24,0.28 -0.45,0.58 -0.67,0.87 -0.2,0.27 -0.4,0.54 -0.6,0.81 -0.19,0.24 -0.35,0.5 -0.54,0.74 -0.1,0.14 -0.05,0.07 -0.16,0.21 -0.1,0.23 3.14,1.63 3.24,1.4 0.1,-0.14 0.05,-0.07 0.16,-0.22 0.17,-0.24 0.34,-0.47 0.52,-0.71 0.2,-0.27 0.4,-0.53 0.6,-0.8 0.23,-0.29 0.46,-0.58 0.68,-0.88 0.24,-0.31 0.47,-0.61 0.71,-0.92 0.26,-0.33 0.51,-0.67 0.77,-1.01 0.27,-0.36 0.55,-0.72 0.82,-1.08 0.29,-0.4 0.59,-0.79 0.88,-1.19 0.01,-0.01 0.01,-0.02 0.02,-0.03 0.17,0.21 0.34,0.43 0.51,0.64 0.28,0.35 0.55,0.71 0.83,1.07 0.28,0.37 0.57,0.73 0.85,1.1 0.29,0.38 0.58,0.76 0.87,1.13 0.28,0.36 0.56,0.72 0.83,1.09 0.28,0.36 0.55,0.71 0.82,1.07 0.25,0.33 0.5,0.66 0.76,0.98 0.23,0.29 0.46,0.57 0.68,0.87 0.15,0.19 0.07,0.1 0.22,0.28 0.16,0.2 2.92,-2.01 2.76,-2.21 -0.13,-0.17 -0.07,-0.08 -0.2,-0.26 -0.23,-0.31 -0.47,-0.61 -0.71,-0.91 -0.25,-0.33 -0.5,-0.65 -0.76,-0.98 -0.27,-0.35 -0.54,-0.7 -0.81,-1.05 -0.28,-0.37 -0.56,-0.74 -0.85,-1.11 -0.29,-0.37 -0.57,-0.74 -0.86,-1.11 -0.29,-0.38 -0.58,-0.76 -0.87,-1.13 -0.28,-0.37 -0.56,-0.73 -0.85,-1.09 -0.27,-0.34 -0.54,-0.68 -0.81,-1.02 -0.1,-0.13 -0.21,-0.25 -0.31,-0.38 -0.36,-0.45 -0.51,-0.62 -0.77,-0.94 -0.08,-0.1 -0.17,-0.21 -0.25,-0.31 -0.14,-0.17 -0.28,-0.34 -0.41,-0.52 -0.07,-0.09 -0.13,-0.18 -0.19,-0.28zM40.94,20.11c-0.15,0.12 -0.3,0.23 -0.44,0.36 -0.24,0.2 -0.47,0.42 -0.7,0.63 -0.27,0.26 -0.54,0.51 -0.81,0.77 -0.29,0.28 -0.58,0.55 -0.87,0.83 -0.29,0.28 -0.58,0.55 -0.87,0.83 -0.27,0.27 -0.55,0.52 -0.81,0.79 -0.27,0.26 -0.55,0.52 -0.82,0.78 -0.24,0.24 -0.49,0.48 -0.74,0.71 -0.18,0.16 -0.34,0.33 -0.51,0.5 -0.11,-0.13 -0.22,-0.25 -0.32,-0.38 -0.24,-0.29 -0.48,-0.57 -0.72,-0.86 -0.26,-0.31 -0.52,-0.62 -0.78,-0.93 -0.27,-0.31 -0.54,-0.63 -0.8,-0.94 -0.27,-0.3 -0.53,-0.61 -0.81,-0.9 -0.24,-0.26 -0.48,-0.52 -0.71,-0.78 -0.19,-0.22 -0.38,-0.43 -0.58,-0.65 -0.13,-0.14 -0.26,-0.29 -0.4,-0.43 -0.18,-0.18 -2.68,2.32 -2.5,2.5 0.11,0.11 0.21,0.22 0.31,0.34 0.19,0.2 0.37,0.41 0.55,0.62 0.25,0.27 0.49,0.54 0.74,0.81 0.26,0.28 0.51,0.57 0.76,0.85 0.26,0.3 0.52,0.61 0.78,0.92 0.25,0.3 0.5,0.59 0.75,0.89 0.24,0.29 0.49,0.58 0.73,0.87 0.22,0.28 0.46,0.54 0.69,0.81 0.21,0.25 0.42,0.49 0.63,0.74 0.21,0.24 0.43,0.47 0.63,0.71 0.15,0.17 0.29,0.34 0.44,0.51 0.05,0.06 0.28,0.33 0.28,0.33 0,0 0.58,-0.52 0.62,-0.54 0.03,-0.03 0.05,-0.06 0.08,-0.08 0.18,-0.19 0.39,-0.36 0.57,-0.56 0.2,-0.2 0.4,-0.4 0.61,-0.59 0.24,-0.22 0.48,-0.44 0.7,-0.68 0.25,-0.25 0.52,-0.48 0.77,-0.73 0.26,-0.26 0.52,-0.51 0.78,-0.76 0.29,-0.26 0.55,-0.54 0.84,-0.8 0.28,-0.28 0.57,-0.55 0.86,-0.82 0.28,-0.28 0.58,-0.55 0.87,-0.83 0.26,-0.26 0.53,-0.51 0.8,-0.76 0.2,-0.19 0.4,-0.38 0.59,-0.57 0.12,-0.1 0.22,-0.22 0.34,-0.32 0.23,-0.11 -1.31,-3.29 -1.54,-3.18zM10.07,20.43c-1,-0.03 -2.98,0.14 -2.97,0.32 -0.02,0.12 -0.03,0.25 -0.05,0.38 -0.03,0.25 -0.05,0.51 -0.07,0.76 -0.01,0.31 -0.02,0.63 -0.03,0.94 -0.01,0.3 -0.01,0.61 -0.02,0.91 -0.01,0.32 0.01,0.65 0.02,0.97 0,0.32 0.02,0.64 0.04,0.96 0.01,0.33 0.05,0.65 0.09,0.98 0.03,0.31 0.07,0.63 0.11,0.94 0.04,0.3 0.09,0.61 0.14,0.91 0.06,0.31 0.14,0.62 0.23,0.93 0.1,0.36 0.27,0.7 0.45,1.03 0.18,0.33 0.4,0.65 0.64,0.94 0.21,0.27 0.45,0.52 0.69,0.76 0.25,0.26 0.53,0.5 0.81,0.73 0.3,0.25 0.62,0.46 0.95,0.67 0.34,0.21 0.7,0.39 1.07,0.56 0.38,0.18 0.77,0.34 1.17,0.49 0.42,0.16 0.84,0.28 1.27,0.4 0.46,0.12 0.92,0.23 1.38,0.32 0.5,0.09 1.01,0.17 1.52,0.23 0.5,0.06 1,0.11 1.5,0.16 0.51,0.05 1.03,0.08 1.54,0.11 0.53,0.03 1.05,0.04 1.58,0.06 0.51,0.01 1.02,0.02 1.53,0.03 0.49,-0 0.98,-0.01 1.47,-0.01 0.47,0 0.94,-0.01 1.41,-0.01 0.48,0.01 0.95,0.02 1.43,0.03 0.47,0.01 0.95,0.02 1.42,0.03 0.38,0 0.76,0.02 1.14,0.02 0.25,0.03 0.67,-3.48 0.42,-3.51 -0.36,0.01 -0.71,0.01 -1.07,0 -0.47,-0.01 -0.94,-0.02 -1.42,-0.03 -0.48,-0.01 -0.96,-0.02 -1.45,-0.03 -0.49,-0.01 -0.98,-0.01 -1.48,0 -0.48,0 -0.97,0.01 -1.45,0.02 -0.49,0 -0.97,-0 -1.46,-0.02 -0.49,-0.01 -0.98,-0.02 -1.48,-0.04 -0.48,-0.03 -0.95,-0.05 -1.43,-0.08 -0.48,-0.04 -0.96,-0.09 -1.44,-0.14 -0.45,-0.05 -0.89,-0.11 -1.34,-0.19 -0.39,-0.07 -0.78,-0.15 -1.16,-0.25 -0.34,-0.09 -0.69,-0.18 -1.02,-0.3 -0.31,-0.11 -0.62,-0.23 -0.93,-0.37 -0.27,-0.13 -0.54,-0.26 -0.8,-0.4 -0.22,-0.13 -0.44,-0.27 -0.64,-0.44 -0.2,-0.16 -0.39,-0.32 -0.56,-0.5 -0.17,-0.17 -0.34,-0.35 -0.48,-0.54 -0.11,-0.14 -0.22,-0.29 -0.3,-0.45 -0.08,-0.15 -0.15,-0.3 -0.18,-0.46 -0.06,-0.22 -0.11,-0.45 -0.14,-0.67 -0.04,-0.26 -0.08,-0.53 -0.12,-0.79 -0.04,-0.28 -0.06,-0.56 -0.09,-0.84 -0.03,-0.28 -0.04,-0.56 -0.06,-0.84 -0.01,-0.29 -0.01,-0.58 -0.02,-0.86 -0.01,-0.28 -0.01,-0.56 0,-0.84 0.01,-0.3 0.01,-0.6 0.02,-0.9 0.01,-0.25 0.01,-0.5 0.04,-0.75 0.02,-0.23 0.05,-0.45 0.08,-0.68 0.02,-0.17 0.03,-0.34 0.04,-0.51l0,-0.01c-0,-0.06 -0.23,-0.1 -0.56,-0.11z"
-        android:strokeAlpha="1" android:strokeColor="#00000000"
-        android:strokeLineCap="square" android:strokeLineJoin="miter" android:strokeWidth="0.30000001"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_reblog_disabled.xml b/app/src/main/res/drawable/ic_reblog_disabled.xml
deleted file mode 100644
index afafe08e..00000000
--- a/app/src/main/res/drawable/ic_reblog_disabled.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="42.519684"
-    android:viewportWidth="42.519684" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
-        android:pathData="M37.79,3.12C36.3,4.63 34.82,6.16 33.35,7.7C30.19,11.06 26.99,14.39 23.77,17.7C20.33,21.24 16.82,24.71 13.31,28.17C10.93,30.56 8.49,32.88 5.98,35.13L5.26,35.74L7.3,38.15C7.57,37.93 7.83,37.7 8.09,37.48C10.63,35.2 13.11,32.84 15.53,30.41C19.05,26.94 22.58,23.46 26.03,19.9C29.26,16.59 32.46,13.25 35.63,9.88C37.08,8.36 38.55,6.85 40.03,5.36L37.79,3.12zM24.58,8.38C24.2,8.38 23.81,8.39 23.43,8.4C23.04,8.4 22.64,8.41 22.25,8.42C21.85,8.43 21.45,8.43 21.05,8.44C20.66,8.45 20.27,8.46 19.88,8.47C19.49,8.48 19.11,8.49 18.73,8.5C18.36,8.51 17.99,8.52 17.62,8.53C17.28,8.55 16.94,8.56 16.59,8.57C16.28,8.59 15.96,8.6 15.65,8.62C15.35,8.63 15.05,8.65 14.75,8.67C14.45,8.68 14.16,8.7 13.87,8.72C13.6,8.74 13.32,8.76 13.05,8.79C12.81,8.81 12.58,8.83 12.34,8.86C12.18,8.88 12.03,8.92 11.87,8.93L11.87,8.93C11.62,8.94 11.66,12.47 11.91,12.47C12.04,12.22 12.49,12.32 12.9,12.33C13.15,12.3 13.4,12.28 13.65,12.26C13.93,12.24 14.21,12.22 14.49,12.2C14.78,12.18 15.07,12.16 15.37,12.15C15.67,12.13 15.98,12.11 16.28,12.1C16.62,12.08 16.95,12.07 17.29,12.06C17.65,12.05 18.01,12.03 18.38,12.02C18.75,12.01 19.13,12 19.51,11.99C19.9,11.98 20.29,11.97 20.68,11.96C21.07,11.95 21.47,11.95 21.87,11.94C22.26,11.93 22.64,11.93 23.03,11.92C23.42,11.91 23.8,11.91 24.18,11.9C24.53,11.89 24.89,11.89 25.24,11.89C25.6,11.9 25.96,11.9 26.32,11.91C26.39,11.91 26.46,11.92 26.53,11.92C27.56,10.85 28.6,9.79 29.63,8.71C29.44,8.68 29.25,8.64 29.05,8.61C28.69,8.56 28.33,8.52 27.97,8.49C27.59,8.45 27.21,8.44 26.83,8.41C26.47,8.41 26.1,8.4 25.74,8.39C25.35,8.38 24.97,8.37 24.58,8.38zM8.31,9.3C8.31,9.3 7.63,10.27 7.6,10.33C7.48,10.51 7.36,10.69 7.24,10.87C7.15,10.99 7.07,11.11 6.99,11.23C6.45,12.01 6.35,12.11 6.2,12.35C6.13,12.45 6.07,12.55 6,12.64C5.73,13.03 5.45,13.41 5.17,13.79C4.89,14.17 4.61,14.55 4.32,14.92C4.04,15.29 3.76,15.65 3.49,16.02C3.24,16.35 2.98,16.68 2.73,17.01C2.49,17.33 2.25,17.64 2.01,17.96C1.78,18.24 1.56,18.54 1.34,18.83C1.14,19.1 0.94,19.37 0.73,19.64C0.54,19.88 0.39,20.14 0.2,20.38C0.09,20.51 0.14,20.45 0.04,20.59C-0.06,20.82 3.19,22.22 3.29,21.99C3.39,21.85 3.34,21.92 3.45,21.77C3.61,21.53 3.79,21.3 3.97,21.06C4.17,20.8 4.37,20.53 4.57,20.27C4.8,19.97 5.03,19.68 5.25,19.38C5.48,19.08 5.72,18.77 5.95,18.46C6.21,18.13 6.47,17.79 6.72,17.45C6.99,17.09 7.26,16.73 7.54,16.37C7.84,15.97 8.14,15.58 8.42,15.18C8.43,15.17 8.44,15.16 8.44,15.15C8.62,15.36 8.79,15.58 8.96,15.79C9.24,16.14 9.51,16.5 9.79,16.86C10.07,17.23 10.35,17.59 10.63,17.96C10.92,18.34 11.21,18.72 11.51,19.1C11.79,19.46 12.06,19.82 12.34,20.18C12.62,20.54 12.89,20.9 13.16,21.25C13.41,21.58 13.67,21.91 13.92,22.24C14.15,22.52 14.38,22.81 14.6,23.11C14.75,23.3 14.67,23.2 14.82,23.39C14.89,23.49 15.58,23.01 16.26,22.48C16.69,22.04 17.13,21.6 17.56,21.16C17.47,21.05 17.5,21.08 17.38,20.93C17.15,20.62 16.92,20.32 16.68,20.02C16.42,19.69 16.17,19.37 15.92,19.04C15.65,18.69 15.38,18.34 15.11,17.99C14.83,17.62 14.55,17.25 14.26,16.88C13.98,16.51 13.69,16.14 13.4,15.77C13.12,15.39 12.83,15.01 12.54,14.63C12.25,14.27 11.97,13.9 11.68,13.54C11.41,13.2 11.14,12.86 10.87,12.53C10.77,12.4 10.66,12.27 10.56,12.15C10.2,11.7 10.05,11.53 9.79,11.21C9.71,11.1 9.62,11 9.54,10.89C9.4,10.72 9.26,10.55 9.13,10.38C9.06,10.28 9,10.19 8.94,10.1C8.9,10.03 8.31,9.3 8.31,9.3zM35.23,13.22C34.33,14.17 33.42,15.1 32.51,16.04C32.52,16.07 32.53,16.11 32.54,16.14C32.6,16.4 32.66,16.66 32.71,16.91C32.77,17.18 32.8,17.46 32.83,17.74C32.88,18.03 32.9,18.33 32.91,18.63C32.94,18.95 32.95,19.26 32.96,19.58C32.96,19.9 32.96,20.23 32.96,20.56C32.97,20.87 32.97,21.18 32.98,21.49L32.98,22.35C32.99,22.61 32.99,22.87 32.99,23.13C33.03,23.38 36.53,22.9 36.5,22.65C36.49,22.4 36.49,22.14 36.49,21.88L36.48,21.02C36.48,20.7 36.47,20.39 36.47,20.08C36.46,19.74 36.46,19.4 36.45,19.06C36.44,18.7 36.41,18.34 36.39,17.98C36.36,17.62 36.32,17.27 36.27,16.91C36.22,16.56 36.17,16.21 36.09,15.86C36.01,15.53 35.94,15.19 35.84,14.86C35.74,14.55 35.64,14.23 35.53,13.93C35.44,13.69 35.34,13.46 35.23,13.22zM40.94,20.11C40.8,20.23 40.64,20.33 40.51,20.47C40.26,20.67 40.04,20.89 39.81,21.1C39.54,21.36 39.27,21.61 39,21.87C38.72,22.15 38.42,22.42 38.13,22.7C37.85,22.98 37.56,23.25 37.27,23.53C37,23.79 36.72,24.05 36.46,24.32C36.18,24.58 35.91,24.84 35.64,25.1C35.4,25.34 35.15,25.58 34.9,25.81C34.72,25.97 34.56,26.14 34.39,26.31C34.28,26.19 34.17,26.06 34.06,25.93C33.82,25.65 33.58,25.36 33.34,25.08C33.08,24.77 32.82,24.46 32.56,24.15C32.29,23.84 32.03,23.52 31.76,23.21C31.49,22.91 31.22,22.6 30.95,22.31C30.71,22.05 30.47,21.79 30.24,21.53C30.04,21.31 29.85,21.09 29.66,20.88C29.52,20.74 29.39,20.59 29.25,20.46C29.08,20.28 26.58,22.78 26.75,22.96C26.86,23.06 26.96,23.18 27.07,23.29C27.25,23.49 27.44,23.7 27.62,23.91C27.87,24.18 28.11,24.45 28.36,24.71C28.62,24.99 28.87,25.28 29.12,25.57C29.38,25.87 29.65,26.18 29.91,26.48C30.16,26.78 30.41,27.08 30.65,27.38C30.9,27.66 31.14,27.95 31.38,28.24C31.61,28.52 31.85,28.78 32.08,29.05C32.29,29.3 32.5,29.54 32.71,29.79C32.92,30.03 33.13,30.26 33.34,30.5C33.49,30.67 33.64,30.84 33.78,31.01C33.83,31.06 34.06,31.33 34.06,31.33C34.06,31.33 34.65,30.82 34.68,30.79C34.71,30.77 34.74,30.74 34.76,30.71C34.95,30.52 35.15,30.35 35.33,30.15C35.53,29.95 35.73,29.75 35.94,29.56C36.18,29.34 36.42,29.12 36.64,28.89C36.89,28.63 37.16,28.41 37.41,28.16C37.67,27.9 37.93,27.65 38.19,27.4C38.48,27.14 38.75,26.86 39.03,26.59C39.31,26.32 39.6,26.04 39.89,25.77C40.17,25.49 40.46,25.22 40.75,24.94C41.02,24.69 41.28,24.43 41.55,24.18C41.75,23.99 41.95,23.8 42.14,23.61C42.26,23.51 42.36,23.39 42.48,23.29C42.71,23.18 41.17,20 40.94,20.11zM10.07,20.43C9.08,20.4 7.09,20.57 7.11,20.75C7.09,20.88 7.07,21.01 7.05,21.13C7.02,21.39 7,21.64 6.98,21.9C6.97,22.21 6.96,22.52 6.95,22.84C6.94,23.14 6.94,23.45 6.93,23.75C6.93,24.08 6.94,24.4 6.95,24.73C6.95,25.05 6.96,25.37 6.99,25.69C7,26.02 7.04,26.34 7.07,26.67C7.1,26.98 7.14,27.29 7.19,27.61C7.23,27.91 7.27,28.21 7.33,28.51C7.39,28.83 7.47,29.14 7.56,29.44C7.66,29.8 7.83,30.14 8,30.47C8.94,29.6 9.87,28.73 10.79,27.84C10.78,27.75 10.75,27.66 10.73,27.56C10.69,27.3 10.66,27.03 10.62,26.77C10.58,26.49 10.56,26.21 10.53,25.93C10.5,25.64 10.48,25.36 10.47,25.08C10.46,24.8 10.45,24.51 10.45,24.22C10.44,23.94 10.43,23.66 10.45,23.38C10.45,23.08 10.46,22.79 10.47,22.49C10.48,22.24 10.48,21.98 10.51,21.73C10.53,21.51 10.56,21.28 10.59,21.06C10.61,20.89 10.62,20.72 10.63,20.54L10.63,20.54C10.63,20.48 10.41,20.44 10.07,20.43zM16.86,31.93C15.87,32.89 14.88,33.84 13.89,34.8C14.13,34.87 14.37,34.96 14.61,35.02C15.07,35.15 15.53,35.25 15.99,35.34C16.5,35.43 17.01,35.51 17.52,35.57C18.01,35.63 18.52,35.68 19.02,35.73C19.53,35.78 20.04,35.81 20.56,35.84C21.08,35.87 21.61,35.88 22.14,35.89C22.65,35.9 23.16,35.92 23.67,35.92C24.16,35.92 24.65,35.91 25.14,35.91C25.61,35.91 26.08,35.9 26.55,35.9C27.02,35.9 27.5,35.91 27.97,35.92C28.45,35.93 28.92,35.94 29.4,35.95C29.78,35.95 30.16,35.97 30.54,35.96C30.79,35.99 31.21,32.48 30.96,32.45C30.6,32.46 30.25,32.46 29.89,32.45C29.42,32.45 28.95,32.44 28.47,32.43C27.99,32.42 27.51,32.41 27.03,32.4C26.54,32.39 26.05,32.39 25.55,32.4C25.07,32.41 24.58,32.41 24.1,32.42C23.61,32.42 23.13,32.41 22.64,32.4C22.15,32.39 21.66,32.38 21.17,32.36C20.69,32.33 20.21,32.31 19.74,32.28C19.26,32.23 18.78,32.18 18.3,32.13C17.85,32.08 17.41,32.02 16.96,31.95C16.93,31.94 16.89,31.93 16.86,31.93z"
-        android:strokeAlpha="1" android:strokeColor="#00000000"
-        android:strokeLineCap="square" android:strokeLineJoin="miter" android:strokeWidth="0.30000001"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_reblogged.xml b/app/src/main/res/drawable/ic_reblogged.xml
deleted file mode 100644
index 1f9d8b64..00000000
--- a/app/src/main/res/drawable/ic_reblogged.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector android:height="16dp" android:viewportHeight="566.92914"
-    android:viewportWidth="566.92914" android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
-        android:pathData="M141.7,0C63.2,0 0,63.2 0,141.7L0,425.2C0,503.7 63.2,566.9 141.7,566.9L425.2,566.9C503.7,566.9 566.9,503.7 566.9,425.2L566.9,141.7C566.9,63.2 503.7,0 425.2,0L141.7,0zM177.2,124L354.3,124C432.9,124 496.1,182.6 496.1,265.7L496.1,336.6L549.2,336.6L460.6,425.2L372,336.6L425.2,336.6L425.2,265.7C425.2,226.4 393.6,194.9 354.3,194.9L248,194.9L177.2,124zM106.3,141.7L194.9,230.3L141.7,230.3L141.7,301.2C141.7,340.5 173.3,372 212.6,372L318.9,372L389.8,442.9L212.6,442.9C134,442.9 70.9,384.3 70.9,301.2L70.9,230.3L17.7,230.3L106.3,141.7z"
-        android:strokeAlpha="1" android:strokeColor="#00000000"
-        android:strokeLineCap="butt" android:strokeLineJoin="round" android:strokeWidth="0"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_reply.xml b/app/src/main/res/drawable/ic_reply.xml
deleted file mode 100644
index 3df673b9..00000000
--- a/app/src/main/res/drawable/ic_reply.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="42.519684"
-    android:viewportWidth="42.519684" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#ffffff"
-        android:pathData="M15.18,9.94C15.08,9.91 15.02,9.91 15.01,9.94C14.88,10.06 14.74,10.21 14.61,10.35C14.32,10.68 14.04,11 13.75,11.32C13.39,11.73 13.03,12.13 12.67,12.53C12.28,12.95 11.89,13.37 11.49,13.79C11.11,14.2 10.72,14.62 10.33,15.04C9.96,15.44 9.58,15.83 9.21,16.24C8.88,16.61 8.55,16.97 8.21,17.33C7.9,17.65 7.6,18 7.29,18.34C7.2,18.44 7.11,18.53 7.02,18.63C6.83,18.76 6.46,19.18 6.08,19.65C5.96,19.77 5.85,19.89 5.73,20.01C5.5,20.25 5.27,20.49 5.04,20.73C5,20.77 4.97,20.81 4.93,20.85C4.92,20.88 4.98,20.95 5.08,21.03C4.98,21.2 4.92,21.33 4.96,21.36C5.04,21.42 5.11,21.49 5.18,21.56C5.41,21.78 5.64,21.99 5.88,22.2C6.2,22.47 6.53,22.73 6.86,22.99C7.25,23.3 7.64,23.59 8.03,23.9C8.44,24.21 8.84,24.54 9.24,24.86C9.65,25.2 10.05,25.54 10.45,25.88C10.86,26.23 11.27,26.58 11.67,26.94C12.08,27.3 12.48,27.66 12.89,28.02C13.28,28.38 13.68,28.74 14.07,29.1C14.46,29.47 14.86,29.83 15.25,30.19C15.64,30.55 16.03,30.91 16.41,31.27C16.47,31.33 16.53,31.38 16.59,31.44C16.77,31.61 19.22,29.07 19.04,28.89C18.98,28.83 18.91,28.77 18.84,28.71C18.45,28.34 18.06,27.97 17.66,27.6C17.27,27.24 16.87,26.88 16.48,26.52C16.08,26.15 15.68,25.78 15.28,25.42C14.87,25.05 14.45,24.68 14.04,24.32C13.62,23.94 13.2,23.58 12.77,23.21C12.36,22.86 11.94,22.5 11.51,22.16C11.1,21.82 10.68,21.49 10.26,21.15C10.09,21.02 9.91,20.88 9.74,20.75C9.96,20.5 10.18,20.25 10.41,20.01C10.7,19.68 11.01,19.36 11.31,19.04C11.65,18.67 11.98,18.3 12.32,17.93C12.69,17.54 13.05,17.14 13.42,16.75C13.8,16.34 14.19,15.92 14.58,15.51C14.98,15.08 15.38,14.65 15.78,14.21C16.14,13.8 16.5,13.39 16.87,12.98C17.14,12.67 17.4,12.36 17.69,12.08C17.84,11.92 17.99,11.76 18.13,11.6C18.23,11.41 15.85,10.11 15.18,9.94zM14.04,18.52L14.04,18.53C13.79,18.49 13.35,22 13.6,22.03L14.05,22.03L14.82,22.03L15.82,22.03C16.22,22.03 16.62,22.03 17.03,22.04C17.5,22.06 17.97,22.07 18.44,22.08C18.93,22.1 19.43,22.11 19.92,22.12C20.4,22.13 20.88,22.15 21.37,22.17C21.85,22.19 22.34,22.23 22.82,22.26C23.3,22.29 23.77,22.33 24.25,22.37C24.7,22.41 25.15,22.46 25.6,22.52C26.03,22.58 26.47,22.65 26.89,22.73C27.3,22.82 27.71,22.92 28.11,23.03C28.48,23.13 28.85,23.26 29.21,23.4C29.54,23.54 29.85,23.71 30.16,23.89C30.48,24.08 30.78,24.3 31.08,24.53C31.37,24.76 31.63,25.02 31.88,25.29C32.12,25.55 32.33,25.84 32.52,26.14C32.72,26.48 32.88,26.84 33.02,27.21C33.18,27.66 33.31,28.13 33.42,28.59C33.54,29.13 33.64,29.67 33.73,30.21C33.82,30.81 33.89,31.42 33.96,32.02C34.03,32.67 34.1,33.32 34.15,33.97C34.16,34.08 34.16,34.19 34.17,34.3C34.22,34.55 37.69,33.87 37.64,33.62C37.63,33.51 37.63,33.4 37.62,33.29C37.56,32.6 37.48,31.92 37.4,31.24C37.32,30.58 37.24,29.92 37.13,29.27C37.03,28.66 36.91,28.04 36.76,27.44C36.61,26.85 36.44,26.27 36.21,25.71C35.99,25.16 35.75,24.63 35.43,24.13C35.13,23.68 34.81,23.24 34.44,22.84C34.08,22.47 33.72,22.11 33.31,21.79C32.92,21.49 32.53,21.19 32.1,20.94C31.67,20.67 31.22,20.42 30.75,20.22C30.29,20.04 29.83,19.85 29.36,19.72C28.89,19.58 28.41,19.46 27.92,19.35C27.43,19.25 26.94,19.16 26.44,19.08C25.95,19.01 25.45,18.95 24.95,18.9C24.46,18.86 23.96,18.81 23.47,18.79C22.96,18.75 22.45,18.71 21.95,18.69C21.44,18.66 20.93,18.63 20.43,18.62C19.94,18.61 19.45,18.6 18.96,18.58C18.49,18.57 18.02,18.56 17.55,18.54C17.12,18.53 16.69,18.51 16.26,18.52L15.26,18.52L14.5,18.52L14.04,18.52z"
-        android:strokeAlpha="1" android:strokeColor="#00000000"
-        android:strokeLineCap="square" android:strokeLineJoin="miter" android:strokeWidth="0.30000001"/>
-</vector>
diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml
index 7f1f9dc1..44f5739c 100644
--- a/app/src/main/res/layout/item_account.xml
+++ b/app/src/main/res/layout/item_account.xml
@@ -3,16 +3,18 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="16dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
     android:id="@+id/account_container">
 
     <RelativeLayout
+        android:paddingTop="8dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
         <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
             android:id="@+id/account_avatar"
             android:layout_marginRight="10dp" />
 
@@ -20,6 +22,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical"
+
             android:layout_centerVertical="true"
             android:layout_toRightOf="@id/account_avatar">
 
@@ -27,12 +30,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/account_display_name"
+                android:text="Display name"
                 android:textColor="?android:textColorPrimary"
                 android:textStyle="normal|bold" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:text="\@username"
                 android:textColor="?android:textColorSecondary"
                 android:id="@+id/account_username" />
 
@@ -45,6 +50,7 @@
         android:layout_height="wrap_content"
         android:id="@+id/account_note"
         android:paddingTop="4dp"
+        android:paddingBottom="8dp"
         android:textColor="?android:textColorTertiary" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tab_main.xml b/app/src/main/res/layout/tab_main.xml
deleted file mode 100644
index 5684fffd..00000000
--- a/app/src/main/res/layout/tab_main.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/title"
-        android:layout_centerInParent="true"
-        android:textAllCaps="true"
-        android:textStyle="normal|bold" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/transition/activity_slide.xml b/app/src/main/res/transition/activity_slide.xml
deleted file mode 100644
index cd343707..00000000
--- a/app/src/main/res/transition/activity_slide.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<slide xmlns:android="http://schemas.android.com/apk/res/"
-    android:duration="1000"/>
\ No newline at end of file