diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/CommentsListingRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/CommentsListingRecyclerViewAdapter.java
index 6cd7d189..9a7fa962 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/CommentsListingRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/CommentsListingRecyclerViewAdapter.java
@@ -7,19 +7,17 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
-import androidx.cardview.widget.CardView;
 import androidx.core.content.ContextCompat;
 import androidx.paging.PagedListAdapter;
 import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.google.android.material.card.MaterialCardView;
-
 import CustomView.CustomMarkwonView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -70,14 +68,11 @@ class CommentsListingRecyclerViewAdapter extends PagedListAdapter<CommentData, R
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         if(viewType == VIEW_TYPE_DATA) {
-            CardView cardView = (CardView) LayoutInflater.from(parent.getContext()).inflate(R.layout.item_comment, parent, false);
-            return new DataViewHolder(cardView);
+            return new DataViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_comment, parent, false));
         } else if(viewType == VIEW_TYPE_ERROR) {
-            RelativeLayout relativeLayout = (RelativeLayout) LayoutInflater.from(parent.getContext()).inflate(R.layout.item_footer_error, parent, false);
-            return new ErrorViewHolder(relativeLayout);
+            return new ErrorViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_footer_error, parent, false));
         } else {
-            RelativeLayout relativeLayout = (RelativeLayout) LayoutInflater.from(parent.getContext()).inflate(R.layout.item_footer_loading, parent, false);
-            return new LoadingViewHolder(relativeLayout);
+            return new LoadingViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_footer_loading, parent, false));
         }
     }
 
@@ -165,7 +160,7 @@ class CommentsListingRecyclerViewAdapter extends PagedListAdapter<CommentData, R
     }
 
     class DataViewHolder extends RecyclerView.ViewHolder {
-        @BindView(R.id.card_view_item_comment) MaterialCardView cardView;
+        @BindView(R.id.linear_layout_item_comment) LinearLayout linearLayout;
         @BindView(R.id.vertical_block_item_post_comment) View verticalBlock;
         @BindView(R.id.author_text_view_item_post_comment) TextView authorTextView;
         @BindView(R.id.comment_time_text_view_item_post_comment) TextView commentTimeTextView;
@@ -180,7 +175,7 @@ class CommentsListingRecyclerViewAdapter extends PagedListAdapter<CommentData, R
             super(itemView);
             ButterKnife.bind(this, itemView);
 
-            cardView.setOnClickListener(view -> {
+            linearLayout.setOnClickListener(view -> {
                 Intent intent = new Intent(mContext, ViewPostDetailActivity.class);
                 intent.putExtra(ViewPostDetailActivity.EXTRA_POST_ID, getItem(getAdapterPosition()).getLinkId());
                 mContext.startActivity(intent);
@@ -188,7 +183,7 @@ class CommentsListingRecyclerViewAdapter extends PagedListAdapter<CommentData, R
 
             verticalBlock.setVisibility(View.GONE);
 
-            commentMarkdownView.setOnClickListener(view -> cardView.callOnClick());
+            commentMarkdownView.setOnClickListener(view -> linearLayout.callOnClick());
 
             RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) shareButton.getLayoutParams();
             lp.addRule(RelativeLayout.ALIGN_PARENT_END);
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/MainActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/MainActivity.java
index 3fd746aa..14b76146 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/MainActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/MainActivity.java
@@ -149,7 +149,7 @@ public class MainActivity extends AppCompatActivity implements SortTypeBottomShe
                 int statusBarResourceId = getResources().getIdentifier("status_bar_height", "dimen", "android");
                 if (statusBarResourceId > 0) {
                     ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) toolbar.getLayoutParams();
-                    params.topMargin = getResources().getDimensionPixelSize(statusBarResourceId);
+                    params.topMargin = resources.getDimensionPixelSize(statusBarResourceId);
                     toolbar.setLayoutParams(params);
                 }
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/PostImageActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/PostImageActivity.java
index 2c22b131..823fa1cd 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/PostImageActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/PostImageActivity.java
@@ -1,6 +1,7 @@
 package ml.docilealligator.infinityforreddit;
 
 import android.content.Intent;
+import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -9,6 +10,7 @@ import android.provider.MediaStore;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.Window;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -20,6 +22,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
 
 import com.bumptech.glide.Glide;
@@ -127,6 +130,14 @@ public class PostImageActivity extends AppCompatActivity implements FlairBottomS
 
         ((Infinity) getApplication()).getAppComponent().inject(this);
 
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            Window window = getWindow();
+            if((getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) != Configuration.UI_MODE_NIGHT_YES) {
+                window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
+            }
+            window.setNavigationBarColor(ContextCompat.getColor(this, R.color.navBarColor));
+        }
+
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/PostLinkActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/PostLinkActivity.java
index e8d028ec..4960b627 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/PostLinkActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/PostLinkActivity.java
@@ -1,10 +1,13 @@
 package ml.docilealligator.infinityforreddit;
 
 import android.content.Intent;
+import android.content.res.Configuration;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.Window;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
@@ -14,6 +17,7 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.content.ContextCompat;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.RequestManager;
@@ -102,6 +106,14 @@ public class PostLinkActivity extends AppCompatActivity implements FlairBottomSh
 
         ((Infinity) getApplication()).getAppComponent().inject(this);
 
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            Window window = getWindow();
+            if((getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) != Configuration.UI_MODE_NIGHT_YES) {
+                window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
+            }
+            window.setNavigationBarColor(ContextCompat.getColor(this, R.color.navBarColor));
+        }
+
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/PostTextActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/PostTextActivity.java
index 6b8784de..e4e94243 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/PostTextActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/PostTextActivity.java
@@ -1,10 +1,13 @@
 package ml.docilealligator.infinityforreddit;
 
 import android.content.Intent;
+import android.content.res.Configuration;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.Window;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
@@ -14,6 +17,7 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.content.ContextCompat;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.RequestManager;
@@ -102,6 +106,14 @@ public class PostTextActivity extends AppCompatActivity implements FlairBottomSh
 
         ((Infinity) getApplication()).getAppComponent().inject(this);
 
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            Window window = getWindow();
+            if((getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) != Configuration.UI_MODE_NIGHT_YES) {
+                window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
+            }
+            window.setNavigationBarColor(ContextCompat.getColor(this, R.color.navBarColor));
+        }
+
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/PostVideoActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/PostVideoActivity.java
index 6adf0c75..919502f1 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/PostVideoActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/PostVideoActivity.java
@@ -1,6 +1,7 @@
 package ml.docilealligator.infinityforreddit;
 
 import android.content.Intent;
+import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -8,6 +9,7 @@ import android.provider.MediaStore;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.Window;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
@@ -19,6 +21,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.content.ContextCompat;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.RequestManager;
@@ -126,6 +129,14 @@ public class PostVideoActivity extends AppCompatActivity implements FlairBottomS
 
         ((Infinity) getApplication()).getAppComponent().inject(this);
 
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            Window window = getWindow();
+            if((getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) != Configuration.UI_MODE_NIGHT_YES) {
+                window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
+            }
+            window.setNavigationBarColor(ContextCompat.getColor(this, R.color.navBarColor));
+        }
+
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SearchActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SearchActivity.java
index e0bedcdf..cfade0b9 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/SearchActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SearchActivity.java
@@ -2,10 +2,13 @@ package ml.docilealligator.infinityforreddit;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.content.res.Configuration;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.Window;
 import android.view.WindowManager;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -14,6 +17,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 
 import com.ferfalk.simplesearchview.SimpleSearchView;
 
@@ -49,6 +53,14 @@ public class SearchActivity extends AppCompatActivity {
 
         ButterKnife.bind(this);
 
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            Window window = getWindow();
+            if((getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) != Configuration.UI_MODE_NIGHT_YES) {
+                window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
+            }
+            window.setNavigationBarColor(ContextCompat.getColor(this, R.color.navBarColor));
+        }
+
         setSupportActionBar(toolbar);
 
         boolean searchOnlySubreddits = getIntent().getExtras().getBoolean(EXTRA_SEARCH_ONLY_SUBREDDITS);
diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml
index d949904a..89db5a2f 100644
--- a/app/src/main/res/layout/item_comment.xml
+++ b/app/src/main/res/layout/item_comment.xml
@@ -1,140 +1,134 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/card_view_item_comment"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/linear_layout_item_comment"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
+    <View
+        android:id="@+id/vertical_block_item_post_comment"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:background="@color/textColorPrimaryDark"/>
+
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <View
-            android:id="@+id/vertical_block_item_post_comment"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:background="@color/textColorPrimaryDark"/>
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:layout_marginBottom="12dp"
+        android:orientation="vertical">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:layout_marginBottom="12dp"
-            android:orientation="vertical">
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp">
 
-            <LinearLayout
-                android:layout_width="match_parent"
+            <TextView
+                android:id="@+id/author_text_view_item_post_comment"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp">
+                android:layout_weight="1"
+                android:layout_marginEnd="16dp"
+                android:textColor="@color/textColorPrimaryDark"/>
 
-                <TextView
-                    android:id="@+id/author_text_view_item_post_comment"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_marginEnd="16dp"
-                    android:textColor="@color/textColorPrimaryDark"/>
-
-                <TextView
-                    android:id="@+id/comment_time_text_view_item_post_comment"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="end" />
-
-            </LinearLayout>
-
-            <CustomView.CustomMarkwonView
-                android:id="@+id/comment_markdown_view_item_post_comment"
-                android:layout_width="match_parent"
+            <TextView
+                android:id="@+id/comment_time_text_view_item_post_comment"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_marginStart="32dp"
-                android:layout_marginEnd="32dp"
-                android:layout_marginBottom="8dp"
-                android:textColor="@color/primaryTextColor"/>
-
-            <RelativeLayout
-                android:id="@+id/relative_layout_item_post_comment"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp">
-
-                <ImageView
-                    android:id="@+id/plus_button_item_post_comment"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentStart="true"
-                    android:src="@drawable/ic_arrow_upward_black_20dp"
-                    android:layout_centerVertical="true"
-                    android:tint="@android:color/tab_indicator_text"
-                    android:background="?actionBarItemBackground"
-                    android:clickable="true"
-                    android:focusable="true"/>
-
-                <TextView
-                    android:id="@+id/score_text_view_item_post_comment"
-                    android:layout_width="64dp"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_toEndOf="@id/plus_button_item_post_comment"
-                    android:gravity="center"/>
-
-                <ImageView
-                    android:id="@+id/minus_button_item_post_comment"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_toEndOf="@id/score_text_view_item_post_comment"
-                    android:src="@drawable/ic_arrow_downward_black_20dp"
-                    android:tint="@android:color/tab_indicator_text"
-                    android:background="?actionBarItemBackground"
-                    android:clickable="true"
-                    android:focusable="true"/>
-
-                <ImageView
-                    android:id="@+id/expand_button_item_post_comment"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_toStartOf="@id/share_button_item_post_comment"
-                    android:layout_centerVertical="true"
-                    android:layout_marginEnd="16dp"
-                    android:src="@drawable/ic_expand_less_black_20dp"
-                    android:tint="@android:color/tab_indicator_text"
-                    android:background="?actionBarItemBackground"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:visibility="gone"/>
-
-                <ImageView
-                    android:id="@+id/share_button_item_post_comment"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_toStartOf="@id/reply_button_item_post_comment"
-                    android:layout_centerVertical="true"
-                    android:layout_marginEnd="16dp"
-                    android:src="@drawable/ic_outline_share_20px"
-                    android:tint="@android:color/tab_indicator_text"
-                    android:background="?actionBarItemBackground"
-                    android:clickable="true"
-                    android:focusable="true"/>
-
-                <ImageView
-                    android:id="@+id/reply_button_item_post_comment"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_alignParentEnd="true"
-                    android:src="@drawable/ic_reply_black_20dp"
-                    android:tint="@android:color/tab_indicator_text"
-                    android:background="?actionBarItemBackground"
-                    android:clickable="true"
-                    android:focusable="true"/>
-
-            </RelativeLayout>
+                android:gravity="end" />
 
         </LinearLayout>
 
+        <CustomView.CustomMarkwonView
+            android:id="@+id/comment_markdown_view_item_post_comment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginStart="32dp"
+            android:layout_marginEnd="32dp"
+            android:layout_marginBottom="8dp"
+            android:textColor="@color/primaryTextColor"/>
+
+        <RelativeLayout
+            android:id="@+id/relative_layout_item_post_comment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp">
+
+            <ImageView
+                android:id="@+id/plus_button_item_post_comment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:src="@drawable/ic_arrow_upward_black_20dp"
+                android:layout_centerVertical="true"
+                android:tint="@android:color/tab_indicator_text"
+                android:background="?actionBarItemBackground"
+                android:clickable="true"
+                android:focusable="true"/>
+
+            <TextView
+                android:id="@+id/score_text_view_item_post_comment"
+                android:layout_width="64dp"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toEndOf="@id/plus_button_item_post_comment"
+                android:gravity="center"/>
+
+            <ImageView
+                android:id="@+id/minus_button_item_post_comment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toEndOf="@id/score_text_view_item_post_comment"
+                android:src="@drawable/ic_arrow_downward_black_20dp"
+                android:tint="@android:color/tab_indicator_text"
+                android:background="?actionBarItemBackground"
+                android:clickable="true"
+                android:focusable="true"/>
+
+            <ImageView
+                android:id="@+id/expand_button_item_post_comment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toStartOf="@id/share_button_item_post_comment"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="16dp"
+                android:src="@drawable/ic_expand_less_black_20dp"
+                android:tint="@android:color/tab_indicator_text"
+                android:background="?actionBarItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:visibility="gone"/>
+
+            <ImageView
+                android:id="@+id/share_button_item_post_comment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toStartOf="@id/reply_button_item_post_comment"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="16dp"
+                android:src="@drawable/ic_outline_share_20px"
+                android:tint="@android:color/tab_indicator_text"
+                android:background="?actionBarItemBackground"
+                android:clickable="true"
+                android:focusable="true"/>
+
+            <ImageView
+                android:id="@+id/reply_button_item_post_comment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_alignParentEnd="true"
+                android:src="@drawable/ic_reply_black_20dp"
+                android:tint="@android:color/tab_indicator_text"
+                android:background="?actionBarItemBackground"
+                android:clickable="true"
+                android:focusable="true"/>
+
+        </RelativeLayout>
+
     </LinearLayout>
 
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_load_more_comments_placeholder.xml b/app/src/main/res/layout/item_load_more_comments_placeholder.xml
index 5a006ff5..e9333e6e 100644
--- a/app/src/main/res/layout/item_load_more_comments_placeholder.xml
+++ b/app/src/main/res/layout/item_load_more_comments_placeholder.xml
@@ -1,27 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <LinearLayout
+    <View
+        android:id="@+id/vertical_block_item_load_more_comments"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:background="@color/textColorPrimaryDark" />
+
+    <TextView
+        android:id="@+id/placeholder_text_view_item_load_more_comments"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:padding="8dp"
+        android:text="@string/comment_load_more_comments"
+        android:textColor="@color/primaryTextColor" />
 
-        <View
-            android:id="@+id/vertical_block_item_load_more_comments"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:background="@color/textColorPrimaryDark" />
-
-        <TextView
-            android:id="@+id/placeholder_text_view_item_load_more_comments"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:padding="8dp"
-            android:text="@string/comment_load_more_comments"
-            android:textColor="@color/primaryTextColor" />
-
-    </LinearLayout>
-
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_post_detail.xml b/app/src/main/res/layout/item_post_detail.xml
index 7d85466f..18cae54c 100644
--- a/app/src/main/res/layout/item_post_detail.xml
+++ b/app/src/main/res/layout/item_post_detail.xml
@@ -1,302 +1,296 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:orientation="vertical">
 
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/relative_layout_item_post_detail"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/relative_layout_item_post_detail"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <RelativeLayout
-                android:id="@+id/subreddit_icon_name_relative_layout_item_post_detail"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:padding="16dp"
-                app:layout_constrainedWidth="true"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/post_time_text_view_item_post_detail"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <CustomView.AspectRatioGifImageView
-                    android:id="@+id/icon_gif_image_view_item_post_detail"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_centerVertical="true" />
-
-                <TextView
-                    android:id="@+id/subreddit_text_view_item_post_detail"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:layout_alignParentTop="true"
-                    android:layout_toEndOf="@id/icon_gif_image_view_item_post_detail"
-                    android:textColor="@color/colorAccent" />
-
-                <TextView
-                    android:id="@+id/user_text_view_item_post_detail"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:layout_alignParentBottom="true"
-                    android:layout_below="@id/subreddit_text_view_item_post_detail"
-                    android:layout_toEndOf="@id/icon_gif_image_view_item_post_detail"
-                    android:textColor="@color/textColorPrimaryDark" />
-
-            </RelativeLayout>
-
-            <TextView
-                android:id="@+id/post_time_text_view_item_post_detail"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginEnd="16dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/subreddit_icon_name_relative_layout_item_post_detail"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"/>
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <TextView
-            android:id="@+id/title_text_view_item_post_detail"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:textColor="@color/primaryTextColor"
-            android:textSize="18sp" />
-
-        <CustomView.CustomMarkwonView
-            android:id="@+id/content_markdown_view_item_post_detail"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:layout_marginTop="16dp"
-            android:visibility="gone" />
+        android:layout_height="wrap_content">
 
         <RelativeLayout
-            android:layout_width="match_parent"
+            android:id="@+id/subreddit_icon_name_relative_layout_item_post_detail"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:paddingTop="16dp">
+            android:padding="16dp"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/post_time_text_view_item_post_detail"
+            app:layout_constraintTop_toTopOf="parent">
 
-            <com.google.android.material.chip.Chip
-                android:id="@+id/type_text_view_item_post_detail"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="16dp"
-                android:textColor="@android:color/white"
-                android:layout_centerVertical="true"
-                app:chipBackgroundColor="@color/backgroundColorPrimaryDark"/>
-
-            <ImageView
-                android:id="@+id/gilded_image_view_item_post_detail"
+            <CustomView.AspectRatioGifImageView
+                android:id="@+id/icon_gif_image_view_item_post_detail"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:layout_toEndOf="@id/type_text_view_item_post_detail"
-                android:layout_centerVertical="true"
-                android:visibility="gone"/>
+                android:layout_centerVertical="true" />
 
             <TextView
-                android:id="@+id/gilded_number_text_view_item_post_detail"
+                android:id="@+id/subreddit_text_view_item_post_detail"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="4dp"
-                android:layout_marginEnd="8dp"
-                android:layout_toEndOf="@id/gilded_image_view_item_post_detail"
-                android:layout_centerVertical="true"
-                android:visibility="gone"
-                android:textSize="20sp"
-                android:textColor="@color/gold"/>
+                android:layout_marginStart="16dp"
+                android:layout_alignParentTop="true"
+                android:layout_toEndOf="@id/icon_gif_image_view_item_post_detail"
+                android:textColor="@color/colorAccent" />
 
-            <ImageView
-                android:id="@+id/crosspost_image_view_item_post_detail"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginStart="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_toEndOf="@id/gilded_number_text_view_item_post_detail"
-                android:layout_centerVertical="true"
-                android:src="@drawable/crosspost"
-                android:tint="@color/colorAccent"
-                android:visibility="gone"/>
-
-            <com.google.android.material.chip.Chip
-                android:id="@+id/nsfw_text_view_item_post_detail"
+            <TextView
+                android:id="@+id/user_text_view_item_post_detail"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/nsfw"
-                android:layout_alignParentEnd="true"
-                android:layout_marginStart="8dp"
-                android:textColor="@android:color/white"
-                android:visibility="gone"
-                android:layout_centerVertical="true"
-                app:chipBackgroundColor="@color/colorAccent"/>
+                android:layout_marginStart="16dp"
+                android:layout_alignParentBottom="true"
+                android:layout_below="@id/subreddit_text_view_item_post_detail"
+                android:layout_toEndOf="@id/icon_gif_image_view_item_post_detail"
+                android:textColor="@color/textColorPrimaryDark" />
 
         </RelativeLayout>
 
-        <LinearLayout
-            android:id="@+id/spoiler_flair_linear_layout_item_post_detail"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:visibility="gone">
-
-            <com.libRG.CustomTextView
-                android:id="@+id/spoiler_custom_text_view_item_post_detail"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginStart="16dp"
-                android:text="@string/spoiler"
-                android:textSize="12sp"
-                android:textColor="@android:color/white"
-                android:padding="4dp"
-                android:visibility="gone"
-                app:lib_setRadius="3dp"
-                app:lib_setRoundedBorderColor="@color/textColorPrimaryDark"
-                app:lib_setRoundedView="true"
-                app:lib_setShape="rectangle" />
-
-            <com.libRG.CustomTextView
-                android:id="@+id/flair_custom_text_view_item_post_detail"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginStart="16dp"
-                android:textSize="12sp"
-                android:textColor="@android:color/white"
-                android:padding="4dp"
-                android:visibility="gone"
-                app:lib_setRadius="3dp"
-                app:lib_setRoundedBorderColor="@color/textColorPrimaryDark"
-                app:lib_setRoundedView="true"
-                app:lib_setShape="rectangle" />
-
-        </LinearLayout>
-
         <TextView
-            android:id="@+id/link_text_view_item_post_detail"
-            android:layout_width="match_parent"
+            android:id="@+id/post_time_text_view_item_post_detail"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:textSize="12sp"
-            android:visibility="gone"/>
+            android:layout_gravity="center"
+            android:layout_marginEnd="16dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/subreddit_icon_name_relative_layout_item_post_detail"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"/>
 
-        <RelativeLayout
-            android:id="@+id/image_view_wrapper_item_post_detail"
-            android:layout_width="match_parent"
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <TextView
+        android:id="@+id/title_text_view_item_post_detail"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:textColor="@color/primaryTextColor"
+        android:textSize="18sp" />
+
+    <CustomView.CustomMarkwonView
+        android:id="@+id/content_markdown_view_item_post_detail"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:layout_marginTop="16dp"
+        android:visibility="gone" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:paddingTop="16dp">
+
+        <com.google.android.material.chip.Chip
+            android:id="@+id/type_text_view_item_post_detail"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:visibility="gone">
-
-            <com.santalu.aspectratioimageview.AspectRatioImageView
-                android:id="@+id/image_view_item_post_detail"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:adjustViewBounds="true"
-                android:scaleType="fitStart"/>
-
-            <RelativeLayout
-                android:id="@+id/load_wrapper_item_post_detail"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true">
-
-                <ProgressBar
-                    android:id="@+id/progress_bar_item_post_detail"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true" />
-
-                <TextView
-                    android:id="@+id/load_image_error_text_view_item_post_detail"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:drawableTop="@drawable/ic_error_outline_black_24dp"
-                    android:layout_centerInParent="true"
-                    android:gravity="center"
-                    android:text="@string/tap_to_retry"
-                    android:visibility="gone" />
-
-            </RelativeLayout>
-
-        </RelativeLayout>
+            android:layout_marginEnd="16dp"
+            android:textColor="@android:color/white"
+            android:layout_centerVertical="true"
+            app:chipBackgroundColor="@color/backgroundColorPrimaryDark"/>
 
         <ImageView
-            android:id="@+id/image_view_no_preview_link_item_post_detail"
-            android:layout_width="match_parent"
-            android:layout_height="150dp"
-            android:background="@color/grey"
-            android:scaleType="center"
-            android:src="@drawable/ic_link"
-            android:tint="@android:color/tab_indicator_text"
-            android:visibility="gone" />
+            android:id="@+id/gilded_image_view_item_post_detail"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_toEndOf="@id/type_text_view_item_post_detail"
+            android:layout_centerVertical="true"
+            android:visibility="gone"/>
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+        <TextView
+            android:id="@+id/gilded_number_text_view_item_post_detail"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="8dp"
+            android:layout_toEndOf="@id/gilded_image_view_item_post_detail"
+            android:layout_centerVertical="true"
+            android:visibility="gone"
+            android:textSize="20sp"
+            android:textColor="@color/gold"/>
 
-            <ImageView
-                android:id="@+id/plus_button_item_post_detail"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_centerVertical="true"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                android:padding="16dp"
-                android:src="@drawable/ic_arrow_upward_black_24dp"
-                android:tint="@android:color/tab_indicator_text" />
+        <ImageView
+            android:id="@+id/crosspost_image_view_item_post_detail"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_toEndOf="@id/gilded_number_text_view_item_post_detail"
+            android:layout_centerVertical="true"
+            android:src="@drawable/crosspost"
+            android:tint="@color/colorAccent"
+            android:visibility="gone"/>
 
-            <TextView
-                android:id="@+id/score_text_view_item_post_detail"
-                android:layout_width="64dp"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_toEndOf="@id/plus_button_item_post_detail"
-                android:gravity="center" />
+        <com.google.android.material.chip.Chip
+            android:id="@+id/nsfw_text_view_item_post_detail"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/nsfw"
+            android:layout_alignParentEnd="true"
+            android:layout_marginStart="8dp"
+            android:textColor="@android:color/white"
+            android:visibility="gone"
+            android:layout_centerVertical="true"
+            app:chipBackgroundColor="@color/colorAccent"/>
 
-            <ImageView
-                android:id="@+id/minus_button_item_post_detail"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_toEndOf="@id/score_text_view_item_post_detail"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                android:padding="16dp"
-                android:src="@drawable/ic_arrow_downward_black_24dp"
-                android:tint="@android:color/tab_indicator_text" />
+    </RelativeLayout>
 
-            <ImageView
-                android:id="@+id/share_button_item_post_detail"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                android:padding="16dp"
-                android:src="@drawable/ic_outline_share_24px"
-                android:tint="@android:color/tab_indicator_text" />
+    <LinearLayout
+        android:id="@+id/spoiler_flair_linear_layout_item_post_detail"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:visibility="gone">
 
-        </RelativeLayout>
+        <com.libRG.CustomTextView
+            android:id="@+id/spoiler_custom_text_view_item_post_detail"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginStart="16dp"
+            android:text="@string/spoiler"
+            android:textSize="12sp"
+            android:textColor="@android:color/white"
+            android:padding="4dp"
+            android:visibility="gone"
+            app:lib_setRadius="3dp"
+            app:lib_setRoundedBorderColor="@color/textColorPrimaryDark"
+            app:lib_setRoundedView="true"
+            app:lib_setShape="rectangle" />
+
+        <com.libRG.CustomTextView
+            android:id="@+id/flair_custom_text_view_item_post_detail"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginStart="16dp"
+            android:textSize="12sp"
+            android:textColor="@android:color/white"
+            android:padding="4dp"
+            android:visibility="gone"
+            app:lib_setRadius="3dp"
+            app:lib_setRoundedBorderColor="@color/textColorPrimaryDark"
+            app:lib_setRoundedView="true"
+            app:lib_setShape="rectangle" />
 
     </LinearLayout>
 
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+    <TextView
+        android:id="@+id/link_text_view_item_post_detail"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:textSize="12sp"
+        android:visibility="gone"/>
+
+    <RelativeLayout
+        android:id="@+id/image_view_wrapper_item_post_detail"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone">
+
+        <com.santalu.aspectratioimageview.AspectRatioImageView
+            android:id="@+id/image_view_item_post_detail"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:adjustViewBounds="true"
+            android:scaleType="fitStart"/>
+
+        <RelativeLayout
+            android:id="@+id/load_wrapper_item_post_detail"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true">
+
+            <ProgressBar
+                android:id="@+id/progress_bar_item_post_detail"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true" />
+
+            <TextView
+                android:id="@+id/load_image_error_text_view_item_post_detail"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:drawableTop="@drawable/ic_error_outline_black_24dp"
+                android:layout_centerInParent="true"
+                android:gravity="center"
+                android:text="@string/tap_to_retry"
+                android:visibility="gone" />
+
+        </RelativeLayout>
+
+    </RelativeLayout>
+
+    <ImageView
+        android:id="@+id/image_view_no_preview_link_item_post_detail"
+        android:layout_width="match_parent"
+        android:layout_height="150dp"
+        android:background="@color/grey"
+        android:scaleType="center"
+        android:src="@drawable/ic_link"
+        android:tint="@android:color/tab_indicator_text"
+        android:visibility="gone" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:id="@+id/plus_button_item_post_detail"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
+            android:layout_centerVertical="true"
+            android:background="?actionBarItemBackground"
+            android:clickable="true"
+            android:focusable="true"
+            android:padding="16dp"
+            android:src="@drawable/ic_arrow_upward_black_24dp"
+            android:tint="@android:color/tab_indicator_text" />
+
+        <TextView
+            android:id="@+id/score_text_view_item_post_detail"
+            android:layout_width="64dp"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toEndOf="@id/plus_button_item_post_detail"
+            android:gravity="center" />
+
+        <ImageView
+            android:id="@+id/minus_button_item_post_detail"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toEndOf="@id/score_text_view_item_post_detail"
+            android:background="?actionBarItemBackground"
+            android:clickable="true"
+            android:focusable="true"
+            android:padding="16dp"
+            android:src="@drawable/ic_arrow_downward_black_24dp"
+            android:tint="@android:color/tab_indicator_text" />
+
+        <ImageView
+            android:id="@+id/share_button_item_post_detail"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="?actionBarItemBackground"
+            android:clickable="true"
+            android:focusable="true"
+            android:padding="16dp"
+            android:src="@drawable/ic_outline_share_24px"
+            android:tint="@android:color/tab_indicator_text" />
+
+    </RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 4827628f..590ba6ce 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -41,4 +41,6 @@
     <color name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">@color/colorPrimary</color>
 
     <color name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator">@color/tabLayoutWithCollapsedCollapsingToolbarTextColor</color>
+
+    <color name="navBarColor">@color/backgroundColor</color>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 2f5b389f..8b9eb013 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -41,4 +41,6 @@
     <color name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">@color/colorPrimary</color>
 
     <color name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator">@color/tabLayoutWithCollapsedCollapsingToolbarTextColor</color>
+
+    <color name="navBarColor">#FFFFFF</color>
 </resources>