diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java
index ccbd0e61..c29f0940 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java
@@ -2111,7 +2111,7 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy
             mArchivedImageView.setColorFilter(mArchivedTintColor, PorterDuff.Mode.SRC_IN);
             mLockedImageView.setColorFilter(mLockedTintColor, PorterDuff.Mode.SRC_IN);
             mCrosspostImageView.setColorFilter(mCrosspostTintColor, PorterDuff.Mode.SRC_IN);
-            mAwardsTextView.setTextColor(mPostTitleColor);
+            mAwardsTextView.setTextColor(mSecondaryTextColor);
             mLinkTextView.setTextColor(mSecondaryTextColor);
             mLoadImageProgressBar.setIndeterminateTintList(ColorStateList.valueOf(mColorAccent));
             mNoPreviewLinkImageView.setBackgroundColor(mNoPreviewLinkBackgroundColor);
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomTheme/CustomThemeWrapper.java b/app/src/main/java/ml/docilealligator/infinityforreddit/CustomTheme/CustomThemeWrapper.java
index 9c37ccaf..3f167cd7 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomTheme/CustomThemeWrapper.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/CustomTheme/CustomThemeWrapper.java
@@ -655,7 +655,7 @@ public class CustomThemeWrapper {
         customTheme.postTitleColor = Color.parseColor("#000000");
         customTheme.postContentColor = Color.parseColor("#8A000000");
         customTheme.commentColor = Color.parseColor("#000000");
-        customTheme.buttonTextColor = Color.parseColor("#FFFFFF");
+        customTheme.buttonTextColor = Color.parseColor("#000000");
         customTheme.backgroundColor = Color.parseColor("#FFFFFF");
         customTheme.cardViewBackgroundColor = Color.parseColor("#FFFFFF");
         customTheme.commentBackgroundColor = Color.parseColor("#FFFFFF");
diff --git a/app/src/main/res/layout/activity_comment.xml b/app/src/main/res/layout/activity_comment.xml
index 09d5ab34..a9af4118 100644
--- a/app/src/main/res/layout/activity_comment.xml
+++ b/app/src/main/res/layout/activity_comment.xml
@@ -2,9 +2,9 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/coordinator_layout_comment_activity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/coordinator_layout_comment_activity"
     android:background="?attr/backgroundColor"
     tools:application=".CommentActivity">
 
@@ -15,21 +15,12 @@
         android:background="?attr/toolbarAndTabBackgroundColor"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <com.google.android.material.appbar.CollapsingToolbarLayout
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar_comment_activity"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:titleEnabled="false"
-            app:toolbarId="@+id/toolbar_comment_activity">
-
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/toolbar_comment_activity"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                app:navigationIcon="?attr/homeAsUpIndicator"
-                app:popupTheme="@style/AppTheme.PopupOverlay" />
-
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
+            android:layout_height="?attr/actionBarSize"
+            app:navigationIcon="?attr/homeAsUpIndicator"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -55,9 +46,9 @@
                 android:id="@+id/content_markdown_view_comment_activity"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
+                android:layout_marginBottom="16dp"
                 android:visibility="gone" />
 
             <View
@@ -71,15 +62,15 @@
                 android:id="@+id/comment_edit_text_comment_activity"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:background="#00000000"
                 android:gravity="top"
-                android:paddingBottom="16dp"
-                android:paddingStart="16dp"
-                android:paddingEnd="16dp"
                 android:hint="@string/write_comment_hint"
                 android:inputType="textCapSentences|textMultiLine"
-                android:textSize="?attr/content_font_18"
-                android:background="#00000000"
-                android:textColor="?attr/primaryTextColor" />
+                android:paddingStart="16dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="16dp"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="?attr/content_font_18" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_edit_comment.xml b/app/src/main/res/layout/activity_edit_comment.xml
index 3952770d..0b77fb15 100644
--- a/app/src/main/res/layout/activity_edit_comment.xml
+++ b/app/src/main/res/layout/activity_edit_comment.xml
@@ -2,9 +2,9 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/coordinator_layout_edit_comment_activity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/coordinator_layout_edit_comment_activity"
     android:background="?attr/backgroundColor"
     tools:context=".Activity.EditCommentActivity">
 
@@ -15,21 +15,12 @@
         android:background="?attr/toolbarAndTabBackgroundColor"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <com.google.android.material.appbar.CollapsingToolbarLayout
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar_edit_comment_activity"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:titleEnabled="false"
-            app:toolbarId="@+id/toolbar_edit_comment_activity">
-
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/toolbar_edit_comment_activity"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                app:popupTheme="@style/AppTheme.PopupOverlay"
-                app:navigationIcon="?attr/homeAsUpIndicator" />
-
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
+            android:layout_height="?attr/actionBarSize"
+            app:navigationIcon="?attr/homeAsUpIndicator"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -37,13 +28,13 @@
         android:id="@+id/comment_edit_text_edit_comment_activity"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="#00000000"
         android:gravity="top"
-        android:padding="16dp"
         android:hint="@string/post_text_content_hint"
         android:inputType="textCapSentences|textMultiLine"
-        android:textSize="?attr/content_font_18"
-        android:background="#00000000"
+        android:padding="16dp"
         android:textColor="?attr/primaryTextColor"
+        android:textSize="?attr/content_font_18"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_post_image.xml b/app/src/main/res/layout/activity_post_image.xml
index e73a08be..e4a21951 100644
--- a/app/src/main/res/layout/activity_post_image.xml
+++ b/app/src/main/res/layout/activity_post_image.xml
@@ -2,9 +2,9 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/coordinator_layout_post_image_activity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/coordinator_layout_post_image_activity"
     android:background="?attr/backgroundColor"
     tools:application=".PostImageActivity">
 
@@ -15,21 +15,12 @@
         android:background="?attr/toolbarAndTabBackgroundColor"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <com.google.android.material.appbar.CollapsingToolbarLayout
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar_post_image_activity"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:titleEnabled="false"
-            app:toolbarId="@+id/toolbar_post_image_activity">
-
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/toolbar_post_image_activity"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                app:popupTheme="@style/AppTheme.PopupOverlay"
-                app:navigationIcon="?attr/homeAsUpIndicator" />
-
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
+            android:layout_height="?attr/actionBarSize"
+            app:navigationIcon="?attr/homeAsUpIndicator"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -46,10 +37,10 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingTop="8dp"
-                android:paddingBottom="8dp"
                 android:paddingStart="16dp"
-                android:paddingEnd="16dp">
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp">
 
                 <pl.droidsonroids.gif.GifImageView
                     android:id="@+id/subreddit_icon_gif_image_view_post_image_activity"
@@ -62,11 +53,11 @@
                     android:id="@+id/subreddit_name_text_view_post_image_activity"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_toStartOf="@id/rules_button_post_image_activity"
-                    android:layout_toEndOf="@id/subreddit_icon_gif_image_view_post_image_activity"
                     android:layout_centerVertical="true"
                     android:layout_marginStart="32dp"
                     android:layout_marginEnd="16dp"
+                    android:layout_toStartOf="@id/rules_button_post_image_activity"
+                    android:layout_toEndOf="@id/subreddit_icon_gif_image_view_post_image_activity"
                     android:text="@string/choose_a_subreddit"
                     android:textSize="?attr/font_default" />
 
@@ -147,13 +138,13 @@
                 android:id="@+id/post_title_edit_text_post_image_activity"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="#00000000"
                 android:gravity="top"
-                android:padding="16dp"
                 android:hint="@string/post_title_hint"
                 android:inputType="textCapSentences|textMultiLine"
-                android:textSize="?attr/title_font_18"
-                android:background="#00000000"
-                android:textColor="?attr/primaryTextColor" />
+                android:padding="16dp"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="?attr/title_font_18" />
 
             <View
                 android:id="@+id/divider_3_post_image_activity"
@@ -172,12 +163,12 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:src="@drawable/ic_outline_add_a_photo_24dp"
-                    app:layout_constraintTop_toTopOf="parent"
+                    app:backgroundTint="?attr/colorPrimaryLightTheme"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toStartOf="@+id/select_from_library_fab_post_image_activity"
                     app:layout_constraintHorizontal_chainStyle="spread"
-                    app:backgroundTint="?attr/colorPrimaryLightTheme"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
                     app:tint="@android:color/white" />
 
                 <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -185,12 +176,12 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:src="@drawable/ic_outline_select_photo_24dp"
-                    app:layout_constraintTop_toTopOf="parent"
+                    app:backgroundTint="?attr/colorPrimaryLightTheme"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toEndOf="@+id/capture_fab_post_image_activity"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_chainStyle="spread"
-                    app:backgroundTint="?attr/colorPrimaryLightTheme"
+                    app:layout_constraintStart_toEndOf="@+id/capture_fab_post_image_activity"
+                    app:layout_constraintTop_toTopOf="parent"
                     app:tint="@android:color/white" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
@@ -209,8 +200,8 @@
                 android:id="@+id/image_view_post_image_activity"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:scaleType="fitStart"
                 android:adjustViewBounds="true"
+                android:scaleType="fitStart"
                 android:visibility="gone" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/activity_post_link.xml b/app/src/main/res/layout/activity_post_link.xml
index 7998c1d6..4b7ba671 100644
--- a/app/src/main/res/layout/activity_post_link.xml
+++ b/app/src/main/res/layout/activity_post_link.xml
@@ -2,9 +2,9 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/coordinator_layout_post_link_activity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/coordinator_layout_post_link_activity"
     android:background="?attr/backgroundColor"
     tools:application=".PostTextActivity">
 
@@ -15,21 +15,12 @@
         android:background="?attr/toolbarAndTabBackgroundColor"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <com.google.android.material.appbar.CollapsingToolbarLayout
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar_post_link_activity"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:titleEnabled="false"
-            app:toolbarId="@+id/toolbar_post_link_activity">
-
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/toolbar_post_link_activity"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                app:popupTheme="@style/AppTheme.PopupOverlay"
-                app:navigationIcon="?attr/homeAsUpIndicator" />
-
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
+            android:layout_height="?attr/actionBarSize"
+            app:navigationIcon="?attr/homeAsUpIndicator"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -46,10 +37,10 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingTop="8dp"
-                android:paddingBottom="8dp"
                 android:paddingStart="16dp"
-                android:paddingEnd="16dp">
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp">
 
                 <pl.droidsonroids.gif.GifImageView
                     android:id="@+id/subreddit_icon_gif_image_view_post_link_activity"
@@ -62,11 +53,11 @@
                     android:id="@+id/subreddit_name_text_view_post_link_activity"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_toStartOf="@id/rules_button_post_link_activity"
-                    android:layout_toEndOf="@id/subreddit_icon_gif_image_view_post_link_activity"
                     android:layout_centerVertical="true"
                     android:layout_marginStart="32dp"
                     android:layout_marginEnd="16dp"
+                    android:layout_toStartOf="@id/rules_button_post_link_activity"
+                    android:layout_toEndOf="@id/subreddit_icon_gif_image_view_post_link_activity"
                     android:text="@string/choose_a_subreddit"
                     android:textSize="?attr/font_default" />
 
@@ -147,13 +138,13 @@
                 android:id="@+id/post_title_edit_text_post_link_activity"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="#00000000"
                 android:gravity="top"
-                android:padding="16dp"
                 android:hint="@string/post_title_hint"
                 android:inputType="textCapSentences|textMultiLine"
-                android:textSize="?attr/title_font_18"
-                android:background="#00000000"
-                android:textColor="?attr/primaryTextColor" />
+                android:padding="16dp"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="?attr/title_font_18" />
 
             <View
                 android:id="@+id/divider_3_post_link_activity"
@@ -165,13 +156,13 @@
                 android:id="@+id/post_link_edit_text_post_link_activity"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:background="#00000000"
                 android:gravity="top"
-                android:padding="16dp"
                 android:hint="@string/post_link_hint"
                 android:inputType="textMultiLine"
-                android:textSize="?attr/content_font_18"
-                android:background="#00000000"
-                android:textColor="?attr/primaryTextColor" />
+                android:padding="16dp"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="?attr/content_font_18" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_post_text.xml b/app/src/main/res/layout/activity_post_text.xml
index 4109c150..b4a7fb4a 100644
--- a/app/src/main/res/layout/activity_post_text.xml
+++ b/app/src/main/res/layout/activity_post_text.xml
@@ -2,9 +2,9 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/coordinator_layout_post_text_activity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/coordinator_layout_post_text_activity"
     android:background="?attr/backgroundColor"
     tools:application=".PostTextActivity">
 
@@ -15,21 +15,12 @@
         android:background="?attr/toolbarAndTabBackgroundColor"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <com.google.android.material.appbar.CollapsingToolbarLayout
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar_post_text_activity"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:titleEnabled="false"
-            app:toolbarId="@+id/toolbar_post_text_activity">
-
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/toolbar_post_text_activity"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                app:popupTheme="@style/AppTheme.PopupOverlay"
-                app:navigationIcon="?attr/homeAsUpIndicator" />
-
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
+            android:layout_height="?attr/actionBarSize"
+            app:navigationIcon="?attr/homeAsUpIndicator"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -46,10 +37,10 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingTop="8dp"
-                android:paddingBottom="8dp"
                 android:paddingStart="16dp"
-                android:paddingEnd="16dp">
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp">
 
                 <pl.droidsonroids.gif.GifImageView
                     android:id="@+id/subreddit_icon_gif_image_view_search_activity"
@@ -62,11 +53,11 @@
                     android:id="@+id/subreddit_name_text_view_search_activity"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_toStartOf="@id/rules_button_post_text_activity"
-                    android:layout_toEndOf="@id/subreddit_icon_gif_image_view_search_activity"
                     android:layout_centerVertical="true"
                     android:layout_marginStart="32dp"
                     android:layout_marginEnd="16dp"
+                    android:layout_toStartOf="@id/rules_button_post_text_activity"
+                    android:layout_toEndOf="@id/subreddit_icon_gif_image_view_search_activity"
                     android:text="@string/choose_a_subreddit"
                     android:textSize="?attr/font_default" />
 
@@ -87,7 +78,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:background="?attr/dividerColor" />
-            
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
@@ -147,13 +138,13 @@
                 android:id="@+id/post_title_edit_text_post_text_activity"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="#00000000"
                 android:gravity="top"
-                android:padding="16dp"
                 android:hint="@string/post_title_hint"
                 android:inputType="textCapSentences|textMultiLine"
-                android:textSize="?attr/title_font_18"
-                android:background="#00000000"
-                android:textColor="?attr/primaryTextColor" />
+                android:padding="16dp"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="?attr/title_font_18" />
 
             <View
                 android:id="@+id/divider_3_post_text_activity"
@@ -165,13 +156,13 @@
                 android:id="@+id/post_text_content_edit_text_post_text_activity"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:background="#00000000"
                 android:gravity="top"
-                android:padding="16dp"
                 android:hint="@string/post_text_content_hint"
                 android:inputType="textCapSentences|textMultiLine"
-                android:textSize="?attr/content_font_18"
-                android:background="#00000000"
-                android:textColor="?attr/primaryTextColor" />
+                android:padding="16dp"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="?attr/content_font_18" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_post_video.xml b/app/src/main/res/layout/activity_post_video.xml
index 2b322dcf..ebebe237 100644
--- a/app/src/main/res/layout/activity_post_video.xml
+++ b/app/src/main/res/layout/activity_post_video.xml
@@ -2,9 +2,9 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/coordinator_layout_post_video_activity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/coordinator_layout_post_video_activity"
     android:background="?attr/backgroundColor"
     tools:application=".PostImageActivity">
 
@@ -15,21 +15,12 @@
         android:background="?attr/toolbarAndTabBackgroundColor"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <com.google.android.material.appbar.CollapsingToolbarLayout
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar_post_video_activity"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:titleEnabled="false"
-            app:toolbarId="@+id/toolbar_post_text_activity">
-
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/toolbar_post_video_activity"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                app:popupTheme="@style/AppTheme.PopupOverlay"
-                app:navigationIcon="?attr/homeAsUpIndicator" />
-
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
+            android:layout_height="?attr/actionBarSize"
+            app:navigationIcon="?attr/homeAsUpIndicator"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -46,10 +37,10 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingTop="8dp"
-                android:paddingBottom="8dp"
                 android:paddingStart="16dp"
-                android:paddingEnd="16dp">
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp">
 
                 <pl.droidsonroids.gif.GifImageView
                     android:id="@+id/subreddit_icon_gif_image_view_post_video_activity"
@@ -62,11 +53,11 @@
                     android:id="@+id/subreddit_name_text_view_post_video_activity"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_toStartOf="@id/rules_button_post_video_activity"
-                    android:layout_toEndOf="@id/subreddit_icon_gif_image_view_post_video_activity"
                     android:layout_centerVertical="true"
                     android:layout_marginStart="32dp"
                     android:layout_marginEnd="16dp"
+                    android:layout_toStartOf="@id/rules_button_post_video_activity"
+                    android:layout_toEndOf="@id/subreddit_icon_gif_image_view_post_video_activity"
                     android:text="@string/choose_a_subreddit"
                     android:textSize="?attr/font_default" />
 
@@ -147,13 +138,13 @@
                 android:id="@+id/post_title_edit_text_post_video_activity"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="#00000000"
                 android:gravity="top"
-                android:padding="16dp"
                 android:hint="@string/post_title_hint"
                 android:inputType="textCapSentences|textMultiLine"
-                android:textSize="?attr/title_font_18"
-                android:background="#00000000"
-                android:textColor="?attr/primaryTextColor" />
+                android:padding="16dp"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="?attr/title_font_18" />
 
             <View
                 android:id="@+id/divider_3_post_video_activity"
@@ -172,12 +163,12 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:src="@drawable/ic_outline_add_a_photo_24dp"
-                    app:layout_constraintTop_toTopOf="parent"
+                    app:backgroundTint="?attr/colorPrimaryLightTheme"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toStartOf="@+id/select_from_library_fab_post_video_activity"
                     app:layout_constraintHorizontal_chainStyle="spread"
-                    app:backgroundTint="?attr/colorPrimaryLightTheme"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
                     app:tint="@android:color/white" />
 
                 <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -185,12 +176,12 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:src="@drawable/ic_outline_select_photo_24dp"
-                    app:layout_constraintTop_toTopOf="parent"
+                    app:backgroundTint="?attr/colorPrimaryLightTheme"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toEndOf="@+id/capture_fab_post_video_activity"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_chainStyle="spread"
-                    app:backgroundTint="?attr/colorPrimaryLightTheme"
+                    app:layout_constraintStart_toEndOf="@+id/capture_fab_post_video_activity"
+                    app:layout_constraintTop_toTopOf="parent"
                     app:tint="@android:color/white" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>