Minor layout tweaks.

19 files changed, 196 insertions, 247 deletions

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/MainActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/MainActivity.java
index 793c90a9..ab645240 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/MainActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/MainActivity.java
@@ -139,30 +139,30 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
     LinearLayout allDrawerItemsLinearLayout;
     @BindView(R.id.account_label_main_activity)
     TextView accountLabelTextView;
-    @BindView(R.id.profile_linear_layout_main_activity)
-    LinearLayout profileLinearLayout;
-    @BindView(R.id.subscriptions_linear_layout_main_activity)
-    LinearLayout subscriptionLinearLayout;
-    @BindView(R.id.multi_reddits_linear_layout_main_activity)
-    LinearLayout multiRedditsLinearLayout;
-    @BindView(R.id.inbox_linear_layout_main_activity)
-    LinearLayout inboxLinearLayout;
+    @BindView(R.id.profile_text_view_main_activity)
+    TextView profileLinearLayout;
+    @BindView(R.id.subscriptions_text_view_main_activity)
+    TextView subscriptionLinearLayout;
+    @BindView(R.id.multi_reddits_text_view_main_activity)
+    TextView multiRedditsLinearLayout;
+    @BindView(R.id.inbox_text_view_main_activity)
+    TextView inboxLinearLayout;
     @BindView(R.id.post_label_main_activity)
     TextView postLabelTextView;
-    @BindView(R.id.upvoted_linear_layout_main_activity)
-    LinearLayout upvotedLinearLayout;
-    @BindView(R.id.downvoted_linear_layout_main_activity)
-    LinearLayout downvotedLinearLayout;
-    @BindView(R.id.hidden_linear_layout_main_activity)
-    LinearLayout hiddenLinearLayout;
-    @BindView(R.id.saved_linear_layout_main_activity)
-    LinearLayout savedLinearLayout;
-    @BindView(R.id.gilded_linear_layout_main_activity)
-    LinearLayout gildedLinearLayout;
+    @BindView(R.id.upvoted_text_view_main_activity)
+    TextView upvotedLinearLayout;
+    @BindView(R.id.downvoted_text_view_main_activity)
+    TextView downvotedLinearLayout;
+    @BindView(R.id.hidden_text_view_main_activity)
+    TextView hiddenLinearLayout;
+    @BindView(R.id.saved_text_view_main_activity)
+    TextView savedLinearLayout;
+    @BindView(R.id.gilded_text_view_main_activity)
+    TextView gildedLinearLayout;
     @BindView(R.id.divider_main_activity)
     View divider;
-    @BindView(R.id.settings_linear_layout_main_activity)
-    LinearLayout settingsLinearLayout;
+    @BindView(R.id.settings_text_view_main_activity)
+    TextView settingsLinearLayout;
     @BindView(R.id.account_recycler_view_main_activity)
     RecyclerView accountRecyclerView;
     @BindView(R.id.tab_layout_main_activity)
diff --git a/app/src/main/res/drawable-night/ic_account_circle_24dp.xml b/app/src/main/res/drawable-night/ic_account_circle_24dp.xml
new file mode 100644
index 00000000..cad8c2bc
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_account_circle_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM7.07,18.28c0.43,-0.9 3.05,-1.78 4.93,-1.78s4.51,0.88 4.93,1.78C15.57,19.36 13.86,20 12,20s-3.57,-0.64 -4.93,-1.72zM18.36,16.83c-1.43,-1.74 -4.9,-2.33 -6.36,-2.33s-4.93,0.59 -6.36,2.33C4.62,15.49 4,13.82 4,12c0,-4.41 3.59,-8 8,-8s8,3.59 8,8c0,1.82 -0.62,3.49 -1.64,4.83zM12,6c-1.94,0 -3.5,1.56 -3.5,3.5S10.06,13 12,13s3.5,-1.56 3.5,-3.5S13.94,6 12,6zM12,11c-0.83,0 -1.5,-0.67 -1.5,-1.5S11.17,8 12,8s1.5,0.67 1.5,1.5S12.83,11 12,11z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_arrow_downward_black_24dp.xml b/app/src/main/res/drawable-night/ic_arrow_downward_black_24dp.xml
new file mode 100644
index 00000000..90611a60
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_arrow_downward_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20,12l-1.41,-1.41L13,16.17V4h-2v12.17l-5.58,-5.59L4,12l8,8 8,-8z"
+      android:fillColor="#FFFFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_arrow_upward_black_24dp.xml b/app/src/main/res/drawable-night/ic_arrow_upward_black_24dp.xml
new file mode 100644
index 00000000..b7323a1e
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_arrow_upward_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M4,12l1.41,1.41L11,7.83V20h2V7.83l5.58,5.59L20,12l-8,-8 -8,8z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_inbox_24dp.xml b/app/src/main/res/drawable-night/ic_inbox_24dp.xml
new file mode 100644
index 00000000..cc3f203c
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_inbox_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19v-3h3.56c0.69,1.19 1.97,2 3.45,2s2.75,-0.81 3.45,-2L19,16v3zM19,14h-4.99c0,1.1 -0.9,2 -2,2s-2,-0.9 -2,-2L5,14L5,5h14v9z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_outline_bookmarks_24dp.xml b/app/src/main/res/drawable-night/ic_outline_bookmarks_24dp.xml
new file mode 100644
index 00000000..dc287190
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_outline_bookmarks_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M15,7v12.97l-4.21,-1.81 -0.79,-0.34 -0.79,0.34L5,19.97L5,7h10m4,-6L8.99,1C7.89,1 7,1.9 7,3h10c1.1,0 2,0.9 2,2v13l2,1L21,3c0,-1.1 -0.9,-2 -2,-2zM15,5L5,5c-1.1,0 -2,0.9 -2,2v16l7,-3 7,3L17,7c0,-1.1 -0.9,-2 -2,-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_outline_lock_24dp.xml b/app/src/main/res/drawable-night/ic_outline_lock_24dp.xml
new file mode 100644
index 00000000..d4968533
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_outline_lock_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      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,-2zM9,6c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2L9,8L9,6zM18,20L6,20L6,10h12v10zM12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_settings_24dp.xml b/app/src/main/res/drawable-night/ic_settings_24dp.xml
new file mode 100644
index 00000000..364c03b7
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_settings_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98 0,-0.34 -0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.09,-0.16 -0.26,-0.25 -0.44,-0.25 -0.06,0 -0.12,0.01 -0.17,0.03l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.06,-0.02 -0.12,-0.03 -0.18,-0.03 -0.17,0 -0.34,0.09 -0.43,0.25l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98 0,0.33 0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.09,0.16 0.26,0.25 0.44,0.25 0.06,0 0.12,-0.01 0.17,-0.03l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.06,0.02 0.12,0.03 0.18,0.03 0.17,0 0.34,-0.09 0.43,-0.25l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM17.45,11.27c0.04,0.31 0.05,0.52 0.05,0.73 0,0.21 -0.02,0.43 -0.05,0.73l-0.14,1.13 0.89,0.7 1.08,0.84 -0.7,1.21 -1.27,-0.51 -1.04,-0.42 -0.9,0.68c-0.43,0.32 -0.84,0.56 -1.25,0.73l-1.06,0.43 -0.16,1.13 -0.2,1.35h-1.4l-0.19,-1.35 -0.16,-1.13 -1.06,-0.43c-0.43,-0.18 -0.83,-0.41 -1.23,-0.71l-0.91,-0.7 -1.06,0.43 -1.27,0.51 -0.7,-1.21 1.08,-0.84 0.89,-0.7 -0.14,-1.13c-0.03,-0.31 -0.05,-0.54 -0.05,-0.74s0.02,-0.43 0.05,-0.73l0.14,-1.13 -0.89,-0.7 -1.08,-0.84 0.7,-1.21 1.27,0.51 1.04,0.42 0.9,-0.68c0.43,-0.32 0.84,-0.56 1.25,-0.73l1.06,-0.43 0.16,-1.13 0.2,-1.35h1.39l0.19,1.35 0.16,1.13 1.06,0.43c0.43,0.18 0.83,0.41 1.23,0.71l0.91,0.7 1.06,-0.43 1.27,-0.51 0.7,1.21 -1.07,0.85 -0.89,0.7 0.14,1.13zM12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_star_border_24dp.xml b/app/src/main/res/drawable-night/ic_star_border_24dp.xml
new file mode 100644
index 00000000..7415cbb4
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_star_border_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_arrow_downward_black_24dp.xml b/app/src/main/res/drawable/ic_arrow_downward_black_24dp.xml
index dd7522fd..b6967461 100644
--- a/app/src/main/res/drawable/ic_arrow_downward_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_arrow_downward_black_24dp.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M20,12l-1.41,-1.41L13,16.17V4h-2v12.17l-5.58,-5.59L4,12l8,8 8,-8z"
-      android:fillColor="#010101"/>
+      android:fillColor="#FF000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_outline_bookmarks_24px.xml b/app/src/main/res/drawable/ic_outline_bookmarks_24dp.xml
index 33ceac3f..33ceac3f 100644
--- a/app/src/main/res/drawable/ic_outline_bookmarks_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_bookmarks_24dp.xml
diff --git a/app/src/main/res/drawable/ic_outline_lock.xml b/app/src/main/res/drawable/ic_outline_lock_24dp.xml
index f4299e6c..f4299e6c 100644
--- a/app/src/main/res/drawable/ic_outline_lock.xml
+++ b/app/src/main/res/drawable/ic_outline_lock_24dp.xml
diff --git a/app/src/main/res/drawable/ic_outline_settings_24px.xml b/app/src/main/res/drawable/ic_settings_24dp.xml
index e1fb6a23..e1fb6a23 100644
--- a/app/src/main/res/drawable/ic_outline_settings_24px.xml
+++ b/app/src/main/res/drawable/ic_settings_24dp.xml
diff --git a/app/src/main/res/drawable/ic_outline_star_border_24px.xml b/app/src/main/res/drawable/ic_star_border_24dp.xml
index 0186669d..0186669d 100644
--- a/app/src/main/res/drawable/ic_outline_star_border_24px.xml
+++ b/app/src/main/res/drawable/ic_star_border_24dp.xml
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ba6cc170..ca33eadf 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -50,112 +50,65 @@
                         android:text="@string/label_account"
                         android:textSize="?attr/font_default" />
 
-                    <LinearLayout
-                        android:id="@+id/profile_linear_layout_main_activity"
+                    <TextView
+                        android:id="@+id/profile_text_view_main_activity"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:padding="16dp"
+                        android:drawableStart="@drawable/ic_account_circle_24dp"
+                        android:drawablePadding="32dp"
+                        android:text="@string/profile"
+                        android:textColor="@color/primaryTextColor"
+                        android:textSize="?attr/font_default"
                         android:background="?attr/selectableItemBackground"
                         android:clickable="true"
-                        android:focusable="true"
-                        android:padding="16dp">
-
-                        <ImageView
-                            android:layout_width="24dp"
-                            android:layout_height="24dp"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginEnd="32dp"
-                            android:src="@drawable/ic_account_circle_24dp"
-                            android:tint="@color/primaryTextColor"/>
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:text="@string/profile"
-                            android:textColor="@color/primaryTextColor"
-                            android:textSize="?attr/font_default" />
+                        android:focusable="true" />
 
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:id="@+id/subscriptions_linear_layout_main_activity"
+                    <TextView
+                        android:id="@+id/subscriptions_text_view_main_activity"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:padding="16dp"
+                        android:drawableStart="@drawable/ic_subscritptions_bottom_app_bar_24dp"
+                        android:drawablePadding="32dp"
+                        android:text="@string/subscriptions"
+                        android:textColor="@color/primaryTextColor"
+                        android:textSize="?attr/font_default"
                         android:background="?attr/selectableItemBackground"
                         android:clickable="true"
-                        android:focusable="true"
-                        android:padding="16dp">
+                        android:focusable="true" />
 
-                        <ImageView
-                            android:layout_width="24dp"
-                            android:layout_height="24dp"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginEnd="32dp"
-                            android:src="@drawable/ic_subscritptions_24dp"
-                            android:tint="@color/primaryTextColor"/>
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:text="@string/subscriptions"
-                            android:textColor="@color/primaryTextColor"
-                            android:textSize="?attr/font_default" />
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:id="@+id/multi_reddits_linear_layout_main_activity"
+                    <TextView
+                        android:id="@+id/multi_reddits_text_view_main_activity"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:padding="16dp"
+                        android:drawableStart="@drawable/ic_multi_reddit_24dp"
+                        android:drawablePadding="32dp"
+                        android:text="@string/multi_reddit"
+                        android:textColor="@color/primaryTextColor"
+                        android:textSize="?attr/font_default"
                         android:background="?attr/selectableItemBackground"
                         android:clickable="true"
-                        android:focusable="true"
-                        android:padding="16dp">
-
-                        <ImageView
-                            android:layout_width="24dp"
-                            android:layout_height="24dp"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginEnd="32dp"
-                            android:src="@drawable/ic_multi_reddit_24dp" />
+                        android:focusable="true" />
 
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:text="@string/multi_reddit"
-                            android:textColor="@color/primaryTextColor"
-                            android:textSize="?attr/font_default" />
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:id="@+id/inbox_linear_layout_main_activity"
+                    <TextView
+                        android:id="@+id/inbox_text_view_main_activity"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:padding="16dp"
+                        android:drawableStart="@drawable/ic_inbox_24dp"
+                        android:drawablePadding="32dp"
+                        android:text="@string/inbox"
+                        android:textColor="@color/primaryTextColor"
+                        android:textSize="?attr/font_default"
                         android:background="?attr/selectableItemBackground"
                         android:clickable="true"
-                        android:focusable="true"
-                        android:padding="16dp">
-
-                        <ImageView
-                            android:layout_width="24dp"
-                            android:layout_height="24dp"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginEnd="32dp"
-                            android:src="@drawable/ic_inbox_24dp"
-                            android:tint="@color/primaryTextColor"/>
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:text="@string/inbox"
-                            android:textColor="@color/primaryTextColor"
-                            android:textSize="?attr/font_default" />
-
-                    </LinearLayout>
+                        android:focusable="true" />
 
                     <TextView
                         android:id="@+id/post_label_main_activity"
@@ -165,140 +118,80 @@
                         android:text="@string/label_post"
                         android:textSize="?attr/font_default" />
 
-                    <LinearLayout
-                        android:id="@+id/upvoted_linear_layout_main_activity"
+                    <TextView
+                        android:id="@+id/upvoted_text_view_main_activity"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:padding="16dp"
+                        android:drawableStart="@drawable/ic_arrow_upward_black_24dp"
+                        android:drawablePadding="32dp"
+                        android:text="@string/upvoted"
+                        android:textColor="@color/primaryTextColor"
+                        android:textSize="?attr/font_default"
                         android:background="?attr/selectableItemBackground"
                         android:clickable="true"
-                        android:focusable="true"
-                        android:padding="16dp">
-
-                        <ImageView
-                            android:layout_width="24dp"
-                            android:layout_height="24dp"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginEnd="32dp"
-                            android:src="@drawable/ic_arrow_upward_black_24dp"
-                            android:tint="@color/primaryTextColor"/>
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:text="@string/upvoted"
-                            android:textColor="@color/primaryTextColor"
-                            android:textSize="?attr/font_default" />
-
-                    </LinearLayout>
+                        android:focusable="true" />
 
-                    <LinearLayout
-                        android:id="@+id/downvoted_linear_layout_main_activity"
+                    <TextView
+                        android:id="@+id/downvoted_text_view_main_activity"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:padding="16dp"
+                        android:drawableStart="@drawable/ic_arrow_downward_black_24dp"
+                        android:drawablePadding="32dp"
+                        android:text="@string/downvoted"
+                        android:textColor="@color/primaryTextColor"
+                        android:textSize="?attr/font_default"
                         android:background="?attr/selectableItemBackground"
                         android:clickable="true"
-                        android:focusable="true"
-                        android:padding="16dp">
-
-                        <ImageView
-                            android:layout_width="24dp"
-                            android:layout_height="24dp"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginEnd="32dp"
-                            android:src="@drawable/ic_arrow_downward_black_24dp"
-                            android:tint="@color/primaryTextColor"/>
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:text="@string/downvoted"
-                            android:textColor="@color/primaryTextColor"
-                            android:textSize="?attr/font_default" />
+                        android:focusable="true" />
 
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:id="@+id/hidden_linear_layout_main_activity"
+                    <TextView
+                        android:id="@+id/hidden_text_view_main_activity"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:padding="16dp"
+                        android:drawableStart="@drawable/ic_outline_lock_24dp"
+                        android:drawablePadding="32dp"
+                        android:text="@string/hidden"
+                        android:textColor="@color/primaryTextColor"
+                        android:textSize="?attr/font_default"
                         android:background="?attr/selectableItemBackground"
                         android:clickable="true"
-                        android:focusable="true"
-                        android:padding="16dp">
+                        android:focusable="true" />
 
-                        <ImageView
-                            android:layout_width="24dp"
-                            android:layout_height="24dp"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginEnd="32dp"
-                            android:src="@drawable/ic_outline_lock"
-                            android:tint="@color/primaryTextColor"/>
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:text="@string/hidden"
-                            android:textColor="@color/primaryTextColor"
-                            android:textSize="?attr/font_default" />
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:id="@+id/saved_linear_layout_main_activity"
+                    <TextView
+                        android:id="@+id/saved_text_view_main_activity"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:padding="16dp"
+                        android:drawableStart="@drawable/ic_outline_bookmarks_24dp"
+                        android:drawablePadding="32dp"
+                        android:text="@string/saved"
+                        android:textColor="@color/primaryTextColor"
+                        android:textSize="?attr/font_default"
                         android:background="?attr/selectableItemBackground"
                         android:clickable="true"
-                        android:focusable="true"
-                        android:padding="16dp">
-
-                        <ImageView
-                            android:layout_width="24dp"
-                            android:layout_height="24dp"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginEnd="32dp"
-                            android:src="@drawable/ic_outline_bookmarks_24px"
-                            android:tint="@color/primaryTextColor"/>
+                        android:focusable="true" />
 
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:text="@string/saved"
-                            android:textColor="@color/primaryTextColor"
-                            android:textSize="?attr/font_default" />
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:id="@+id/gilded_linear_layout_main_activity"
+                    <TextView
+                        android:id="@+id/gilded_text_view_main_activity"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:padding="16dp"
+                        android:drawableStart="@drawable/ic_star_border_24dp"
+                        android:drawablePadding="32dp"
+                        android:text="@string/gilded"
+                        android:textColor="@color/primaryTextColor"
+                        android:textSize="?attr/font_default"
                         android:background="?attr/selectableItemBackground"
                         android:clickable="true"
-                        android:focusable="true"
-                        android:padding="16dp">
-
-                        <ImageView
-                            android:layout_width="24dp"
-                            android:layout_height="24dp"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginEnd="32dp"
-                            android:src="@drawable/ic_outline_star_border_24px"
-                            android:tint="@color/primaryTextColor"/>
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:text="@string/gilded"
-                            android:textColor="@color/primaryTextColor"
-                            android:textSize="?attr/font_default" />
-
-                    </LinearLayout>
+                        android:focusable="true" />
 
                     <View
                         android:id="@+id/divider_main_activity"
@@ -306,32 +199,20 @@
                         android:layout_height="1dp"
                         android:background="@color/dividerColor" />
 
-                    <LinearLayout
-                        android:id="@+id/settings_linear_layout_main_activity"
+                    <TextView
+                        android:id="@+id/settings_text_view_main_activity"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:padding="16dp"
+                        android:drawableStart="@drawable/ic_settings_24dp"
+                        android:drawablePadding="32dp"
+                        android:text="@string/settings"
+                        android:textColor="@color/primaryTextColor"
+                        android:textSize="?attr/font_default"
                         android:background="?attr/selectableItemBackground"
                         android:clickable="true"
-                        android:focusable="true"
-                        android:padding="16dp">
-
-                        <ImageView
-                            android:layout_width="24dp"
-                            android:layout_height="24dp"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginEnd="32dp"
-                            android:src="@drawable/ic_outline_settings_24px"
-                            android:tint="@color/primaryTextColor"/>
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:text="@string/settings"
-                            android:textColor="@color/primaryTextColor"
-                            android:textSize="?attr/font_default" />
-
-                    </LinearLayout>
+                        android:focusable="true" />
 
                 </LinearLayout>
 
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index e81f6f7b..34b44e02 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -80,7 +80,6 @@
                 android:paddingTop="8dp"
                 android:paddingBottom="8dp"
                 android:src="@drawable/ic_subscritptions_bottom_app_bar_24dp"
-                android:textColor="@color/primaryTextColor"
                 android:background="?attr/selectableItemBackgroundBorderless" />
 
             <ImageView
@@ -92,7 +91,6 @@
                 android:paddingTop="8dp"
                 android:paddingBottom="8dp"
                 android:src="@drawable/ic_multi_reddit_24dp"
-                android:textColor="@color/primaryTextColor"
                 android:background="?attr/selectableItemBackgroundBorderless" />
 
             <TextView
@@ -110,7 +108,6 @@
                 android:paddingTop="8dp"
                 android:paddingBottom="8dp"
                 android:src="@drawable/ic_inbox_24dp"
-                android:textColor="@color/primaryTextColor"
                 android:background="?attr/selectableItemBackgroundBorderless" />
 
             <ImageView
@@ -123,7 +120,6 @@
                 android:paddingBottom="8dp"
                 android:gravity="center"
                 android:src="@drawable/ic_account_circle_24dp"
-                android:textColor="@color/primaryTextColor"
                 android:background="?attr/selectableItemBackgroundBorderless" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/item_post.xml b/app/src/main/res/layout/item_post.xml
index 787a1fe9..80fee855 100644
--- a/app/src/main/res/layout/item_post.xml
+++ b/app/src/main/res/layout/item_post.xml
@@ -201,7 +201,7 @@
                 android:id="@+id/locked_image_view_item_post"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:src="@drawable/ic_outline_lock"
+                android:src="@drawable/ic_outline_lock_24dp"
                 android:tint="@color/lockedIconTint"
                 android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/item_post_compact.xml b/app/src/main/res/layout/item_post_compact.xml
index 7bcb8072..7123c4db 100644
--- a/app/src/main/res/layout/item_post_compact.xml
+++ b/app/src/main/res/layout/item_post_compact.xml
@@ -188,7 +188,7 @@
                     android:id="@+id/locked_image_view_item_post_compact"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:src="@drawable/ic_outline_lock"
+                    android:src="@drawable/ic_outline_lock_24dp"
                     android:tint="@color/lockedIconTint"
                     android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/item_post_detail.xml b/app/src/main/res/layout/item_post_detail.xml
index 1ccdf2a1..54d48283 100644
--- a/app/src/main/res/layout/item_post_detail.xml
+++ b/app/src/main/res/layout/item_post_detail.xml
@@ -183,7 +183,7 @@
             android:id="@+id/locked_image_view_item_post_detail"
             android:layout_width="20dp"
             android:layout_height="20dp"
-            android:src="@drawable/ic_outline_lock"
+            android:src="@drawable/ic_outline_lock_24dp"
             android:tint="@color/lockedIconTint"
             android:visibility="gone" />