diff --git a/app/src/main/res/color/selector_story_post.xml b/app/src/main/res/color/selector_story_post.xml
new file mode 100644
index 00000000..68b10156
--- /dev/null
+++ b/app/src/main/res/color/selector_story_post.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2020 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     https://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="?attr/colorSecondary"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/selector_story_post_text.xml b/app/src/main/res/color/selector_story_post_text.xml
new file mode 100644
index 00000000..f864921f
--- /dev/null
+++ b/app/src/main/res/color/selector_story_post_text.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2020 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     https://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="?attr/colorOnSecondary"/>
+    <item android:state_checked="false" android:color="?attr/colorOnSecondaryContainer"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 05b96c72..cace3d84 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -27,7 +27,7 @@
                 android:id="@+id/main_drawer_button"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:background="?attr/colorSurface"
+                android:background="?attr/colorSurfaceContainer"
                 android:contentDescription="@string/open_drawer_menu"
                 android:padding="12dp"
                 android:src="@drawable/ic_baseline_menu_24" />
diff --git a/app/src/main/res/layout/activity_post_creation.xml b/app/src/main/res/layout/activity_post_creation.xml
index 98f621cc..0ece2d9c 100644
--- a/app/src/main/res/layout/activity_post_creation.xml
+++ b/app/src/main/res/layout/activity_post_creation.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/colorSecondaryContainer"
+    android:fitsSystemWindows="true"
     tools:context=".postCreation.PostCreationActivity">
 
     <androidx.fragment.app.FragmentContainerView
@@ -11,6 +13,7 @@
         android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="?attr/colorSurface"
         app:defaultNavHost="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -18,4 +21,4 @@
         app:layout_constraintTop_toTopOf="parent"
         app:navGraph="@navigation/post_creation_graph" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_post_creation.xml b/app/src/main/res/layout/fragment_post_creation.xml
index 13e11db2..4a0c0f37 100644
--- a/app/src/main/res/layout/fragment_post_creation.xml
+++ b/app/src/main/res/layout/fragment_post_creation.xml
@@ -21,6 +21,8 @@
         android:layout_height="wrap_content"
         android:minHeight="?attr/actionBarSize"
         android:theme="?attr/actionBarTheme"
+        android:background="?attr/colorSecondaryContainer"
+        app:titleTextColor="?attr/colorOnSecondaryContainer"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -30,6 +32,7 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_marginStart="4dp"
+            android:tint="?attr/colorOnSecondaryContainer"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:contentDescription="@android:string/cancel"
             android:src="?attr/homeAsUpIndicator"
@@ -53,6 +56,8 @@
             <Button
                 android:id="@+id/buttonStory"
                 style="?attr/materialButtonOutlinedStyle"
+                app:backgroundTint="@color/selector_story_post"
+                android:textColor="@color/selector_story_post_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/type_story" />
@@ -60,6 +65,8 @@
             <Button
                 android:id="@+id/buttonPost"
                 style="?attr/materialButtonOutlinedStyle"
+                app:backgroundTint="@color/selector_story_post"
+                android:textColor="@color/selector_story_post_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/type_post" />
diff --git a/app/src/main/res/layout/fragment_post_submission.xml b/app/src/main/res/layout/fragment_post_submission.xml
index e9f94606..60b1201c 100644
--- a/app/src/main/res/layout/fragment_post_submission.xml
+++ b/app/src/main/res/layout/fragment_post_submission.xml
@@ -12,7 +12,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?attr/actionBarSize"
+        android:background="?attr/colorSecondaryContainer"
         android:theme="?attr/actionBarTheme"
+        app:titleTextColor="?attr/colorOnSecondaryContainer"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />