diff --git a/app/build.gradle b/app/build.gradle
index f69e6b97..90195102 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,7 +12,7 @@ def appVersionName = "${versionMajor}.${versionMinor}.${versionPatch}"
 
 def appCompileSdkVersion = 28
 def appPackageName = "com.cyder.android.syncpod"
-def appMinSdkVersion = 19
+def appMinSdkVersion = 21
 def appTargetSdkVersion = 28
 
 android {
diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png
index 5866f58f..067e4186 100644
Binary files a/app/src/main/ic_launcher-web.png and b/app/src/main/ic_launcher-web.png differ
diff --git a/app/src/main/kotlin/com/cyder/android/syncpod/BaseApplication.kt b/app/src/main/kotlin/com/cyder/android/syncpod/BaseApplication.kt
index 574f4774..3ce1bd72 100644
--- a/app/src/main/kotlin/com/cyder/android/syncpod/BaseApplication.kt
+++ b/app/src/main/kotlin/com/cyder/android/syncpod/BaseApplication.kt
@@ -1,8 +1,6 @@
 package com.cyder.android.syncpod
 
 import android.app.Application
-import android.content.Context
-import androidx.multidex.MultiDex
 import com.cyder.android.syncpod.di.AppComponent
 import com.cyder.android.syncpod.di.AppModule
 import com.cyder.android.syncpod.di.DaggerAppComponent
@@ -24,9 +22,4 @@ class BaseApplication : Application() {
         component.inject(this)
 
     }
-
-    override fun attachBaseContext(base: Context?) {
-        super.attachBaseContext(base)
-        MultiDex.install(this)
-    }
 }
diff --git a/app/src/main/res/drawable-hdpi/toolbar_logo.png b/app/src/main/res/drawable-hdpi/toolbar_logo.png
old mode 100755
new mode 100644
index b1d01490..57f91ee2
Binary files a/app/src/main/res/drawable-hdpi/toolbar_logo.png and b/app/src/main/res/drawable-hdpi/toolbar_logo.png differ
diff --git a/app/src/main/res/drawable-mdpi/toolbar_logo.png b/app/src/main/res/drawable-mdpi/toolbar_logo.png
old mode 100755
new mode 100644
index e460b91d..40721cae
Binary files a/app/src/main/res/drawable-mdpi/toolbar_logo.png and b/app/src/main/res/drawable-mdpi/toolbar_logo.png differ
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
index c7bd21db..acbb9b2e 100644
--- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -1,34 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillType="evenOdd"
-        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="78.5885"
-                android:endY="90.9159"
-                android:startX="48.7653"
-                android:startY="61.0927"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1" />
+  android:width="108dp"
+  android:height="108dp"
+  android:viewportWidth="158.86363"
+  android:viewportHeight="158.86363">
+    <group android:translateX="44.48182"
+      android:translateY="46.28682">
+        <path
+          android:pathData="M61.54,8.65c0.49,-0.49 1.14,-0.82 1.63,-1.31A11.58,11.58 0,0 1,66.11 6a0.93,0.93 0,0 0,0.65 -1.15,0.94 0.94,0 0,0 -0.65,-0.65 13.53,13.53 0,0 0,-9.8 -0.33A22.37,22.37 0,0 0,27.74 6.68a22.77,22.77 0,0 0,-6.69 16A10.35,10.35 0,0 1,17 31a10.55,10.55 0,0 1,-13.06 -0.33l-0.16,-0.16A2.33,2.33 0,0 0,0 32.32,35 35,0 1,0 61.54,8.65ZM16.16,53.54s6.53,-29.22 18,-18C45.38,46.85 16.16,53.54 16.16,53.54ZM49.3,14a2.57,2.57 0,0 1,-2 1,3.38 3.38,0 0,1 -2.12,-0.82 3.15,3.15 0,0 1,-0.82 -2.12v-0.49a0.62,0.62 0,0 1,0.16 -0.49c0,-0.16 0.16,-0.33 0.33,-0.49s0.16,-0.33 0.33,-0.49a3.06,3.06 0,0 1,4.24 0,3.15 3.15,0 0,1 0.82,2.12A2.57,2.57 0,0 1,49.3 14Z"
+          android:fillColor="#FFFFFF"/>
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable-xhdpi/toolbar_logo.png b/app/src/main/res/drawable-xhdpi/toolbar_logo.png
old mode 100755
new mode 100644
index 4cad7fb2..8a5d6d35
Binary files a/app/src/main/res/drawable-xhdpi/toolbar_logo.png and b/app/src/main/res/drawable-xhdpi/toolbar_logo.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/toolbar_logo.png b/app/src/main/res/drawable-xxhdpi/toolbar_logo.png
old mode 100755
new mode 100644
index 2784ca21..d729275c
Binary files a/app/src/main/res/drawable-xxhdpi/toolbar_logo.png and b/app/src/main/res/drawable-xxhdpi/toolbar_logo.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/toolbar_logo.png b/app/src/main/res/drawable-xxxhdpi/toolbar_logo.png
old mode 100755
new mode 100644
index f0777635..5455b50d
Binary files a/app/src/main/res/drawable-xxxhdpi/toolbar_logo.png and b/app/src/main/res/drawable-xxxhdpi/toolbar_logo.png differ
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index d5fccc53..00000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillColor="#26A69A"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 00000000..2bd7fd59
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="158.86363"
+    android:viewportHeight="158.86363">
+  <group android:translateX="44.48182"
+      android:translateY="46.28682">
+    <path
+        android:pathData="M61.54,8.65c0.49,-0.49 1.14,-0.82 1.63,-1.31A11.58,11.58 0,0 1,66.11 6a0.93,0.93 0,0 0,0.65 -1.15,0.94 0.94,0 0,0 -0.65,-0.65 13.53,13.53 0,0 0,-9.8 -0.33A22.37,22.37 0,0 0,27.74 6.68a22.77,22.77 0,0 0,-6.69 16A10.35,10.35 0,0 1,17 31a10.55,10.55 0,0 1,-13.06 -0.33l-0.16,-0.16A2.33,2.33 0,0 0,0 32.32,35 35,0 1,0 61.54,8.65ZM16.16,53.54s6.53,-29.22 18,-18C45.38,46.85 16.16,53.54 16.16,53.54ZM49.3,14a2.57,2.57 0,0 1,-2 1,3.38 3.38,0 0,1 -2.12,-0.82 3.15,3.15 0,0 1,-0.82 -2.12v-0.49a0.62,0.62 0,0 1,0.16 -0.49c0,-0.16 0.16,-0.33 0.33,-0.49s0.16,-0.33 0.33,-0.49a3.06,3.06 0,0 1,4.24 0,3.15 3.15,0 0,1 0.82,2.12A2.57,2.57 0,0 1,49.3 14Z"
+        android:fillColor="#FFFFFF"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/layout/activity_contact.xml b/app/src/main/res/layout/activity_contact.xml
index 4488caab..cfee743e 100644
--- a/app/src/main/res/layout/activity_contact.xml
+++ b/app/src/main/res/layout/activity_contact.xml
@@ -56,10 +56,10 @@
                     android:layout_height="55dp"
                     android:layout_marginBottom="20dp"
                     android:layout_marginTop="20dp"
-                    android:background="@color/appGreen"
+                    android:background="@color/appBeige"
                     android:onClick="@{(v) -> viewModel.onSubmit()}"
                     android:text="@string/send_button"
-                    android:textColor="@color/appWhite"
+                    android:textColor="@color/on_beige_text"
                     android:textSize="18sp" />
             </LinearLayout>
         </ScrollView>
diff --git a/app/src/main/res/layout/activity_create_room.xml b/app/src/main/res/layout/activity_create_room.xml
index ac223665..d15f6e1c 100644
--- a/app/src/main/res/layout/activity_create_room.xml
+++ b/app/src/main/res/layout/activity_create_room.xml
@@ -88,10 +88,10 @@
                     android:layout_height="55dp"
                     android:layout_marginBottom="20dp"
                     android:layout_marginTop="20dp"
-                    android:background="@color/appGreen"
+                    android:background="@color/appBeige"
                     android:onClick="@{(v) -> viewModel.onSubmit()}"
                     android:text="@string/create_room_button"
-                    android:textColor="@color/appWhite"
+                    android:textColor="@color/on_beige_text"
                     android:textSize="18sp" />
             </LinearLayout>
         </ScrollView>
diff --git a/app/src/main/res/layout/activity_room.xml b/app/src/main/res/layout/activity_room.xml
index c323b9d6..806ee43f 100644
--- a/app/src/main/res/layout/activity_room.xml
+++ b/app/src/main/res/layout/activity_room.xml
@@ -49,12 +49,13 @@
                     android:layout_width="match_parent"
                     android:layout_height="45dp"
                     android:background="@color/roomTab"
-                    android:elevation="2dp" />
+                    android:elevation="2dp"
+                    app:tabIndicatorColor="@color/appOrange" />
 
                 <com.cyder.android.syncpod.view.components.WithoutKeyEventViewPager
                         android:id="@+id/view_pager"
                         android:layout_height="match_parent"
-                        android:layout_width="match_parent"/>
+                        android:layout_width="match_parent" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_search_video.xml b/app/src/main/res/layout/activity_search_video.xml
index 1944bf03..3b185ba4 100644
--- a/app/src/main/res/layout/activity_search_video.xml
+++ b/app/src/main/res/layout/activity_search_video.xml
@@ -21,7 +21,7 @@
             android:background="?attr/colorPrimary"
             android:elevation="4dp"
             android:minHeight="?attr/actionBarSize"
-            android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
+            android:theme="@style/SearchVideoTheme"
             app:navigationIcon="@drawable/ic_arrow_back_black_24dp"
             app:navigationOnClick="@{(v) -> viewModel.onBackButtonClicked()}">
 
diff --git a/app/src/main/res/layout/activity_sign_in.xml b/app/src/main/res/layout/activity_sign_in.xml
index dd857528..d30eaf37 100644
--- a/app/src/main/res/layout/activity_sign_in.xml
+++ b/app/src/main/res/layout/activity_sign_in.xml
@@ -87,7 +87,7 @@
                     android:layout_height="55dp"
                     android:layout_marginBottom="20dp"
                     android:layout_marginTop="20dp"
-                    android:background="@color/appBlue"
+                    android:background="@color/colorPrimary"
                     android:onClick="@{(v) -> viewModel.onSignIn()}"
                     android:text="@string/send_button"
                     android:textColor="@color/appWhite"
diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml
index d1ddbee3..1b81f536 100644
--- a/app/src/main/res/layout/activity_sign_up.xml
+++ b/app/src/main/res/layout/activity_sign_up.xml
@@ -108,10 +108,10 @@
                     android:layout_height="55dp"
                     android:layout_marginBottom="20dp"
                     android:layout_marginTop="20dp"
-                    android:background="@color/appGreen"
+                    android:background="@color/appBeige"
                     android:onClick="@{(v) -> viewModel.onSignUp()}"
                     android:text="@string/register_button"
-                    android:textColor="@color/appWhite"
+                    android:textColor="@color/on_beige_text"
                     android:textSize="18sp" />
             </LinearLayout>
         </ScrollView>
diff --git a/app/src/main/res/layout/activity_top.xml b/app/src/main/res/layout/activity_top.xml
index f7cbedb3..0169df1e 100644
--- a/app/src/main/res/layout/activity_top.xml
+++ b/app/src/main/res/layout/activity_top.xml
@@ -56,7 +56,7 @@
                         android:clickable="true"
                         android:foreground="?android:attr/selectableItemBackground"
                         android:onClick="@{(v) -> viewModel.onJoinRoom()}"
-                        app:cardBackgroundColor="@color/appBlue">
+                        app:cardBackgroundColor="@color/colorPrimary">
 
                         <LinearLayout
                             android:layout_width="match_parent"
@@ -100,7 +100,7 @@
                         android:clickable="true"
                         android:foreground="?android:attr/selectableItemBackground"
                         android:onClick="@{(v) -> viewModel.onCreateRoom()}"
-                        app:cardBackgroundColor="@color/appGreen">
+                        app:cardBackgroundColor="@color/appBeige">
 
                         <LinearLayout
                             android:layout_width="match_parent"
@@ -118,7 +118,7 @@
                                 android:layout_marginTop="2dp"
                                 android:text="@string/create_room"
                                 android:textAppearance="?android:attr/textAppearanceLarge"
-                                android:textColor="@color/appWhite"
+                                android:textColor="@color/on_beige_text"
                                 android:textSize="26sp" />
 
                             <TextView
@@ -130,7 +130,7 @@
                                 android:minLines="2"
                                 android:text="@string/create_room_description"
                                 android:textAppearance="?android:attr/textAppearanceLarge"
-                                android:textColor="@color/appWhite"
+                                android:textColor="@color/on_beige_text"
                                 android:textSize="14sp" />
 
                         </LinearLayout>
diff --git a/app/src/main/res/layout/activity_user_report.xml b/app/src/main/res/layout/activity_user_report.xml
index aaa0539b..dab34993 100644
--- a/app/src/main/res/layout/activity_user_report.xml
+++ b/app/src/main/res/layout/activity_user_report.xml
@@ -57,10 +57,10 @@
                     android:layout_height="55dp"
                     android:layout_marginBottom="20dp"
                     android:layout_marginTop="20dp"
-                    android:background="@color/appGreen"
+                    android:background="@color/appBeige"
                     android:onClick="@{(v) -> viewModel.onSubmit()}"
                     android:text="@string/send_button"
-                    android:textColor="@color/appWhite"
+                    android:textColor="@color/on_beige_text"
                     android:textSize="18sp" />
             </LinearLayout>
         </ScrollView>
diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml
index 915d3839..fca20aed 100644
--- a/app/src/main/res/layout/activity_welcome.xml
+++ b/app/src/main/res/layout/activity_welcome.xml
@@ -49,7 +49,7 @@
                     android:layout_margin="2dp"
                     android:layout_marginTop="10dp"
                     android:layout_weight="50"
-                    android:background="@color/appBlue"
+                    android:background="@color/colorPrimary"
                     android:onClick="@{(v) -> viewModel.onSignInClicked()}"
                     android:text="@string/login_button"
                     android:textColor="@color/appWhite"
@@ -62,10 +62,10 @@
                     android:layout_margin="2dp"
                     android:layout_marginTop="10dp"
                     android:layout_weight="50"
-                    android:background="@color/appGreen"
+                    android:background="@color/appBeige"
                     android:onClick="@{(v) -> viewModel.onSignUpClicked()}"
                     android:text="@string/new_register"
-                    android:textColor="@color/appWhite"
+                    android:textColor="@color/on_beige_text"
                     android:textSize="18sp" />
 
             </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_roominfo.xml b/app/src/main/res/layout/fragment_roominfo.xml
index 418f7bf1..02f21f70 100644
--- a/app/src/main/res/layout/fragment_roominfo.xml
+++ b/app/src/main/res/layout/fragment_roominfo.xml
@@ -67,7 +67,7 @@
                             android:layout_height="55dp"
                             android:layout_marginBottom="20dp"
                             android:layout_marginTop="20dp"
-                            android:background="@color/appBlue"
+                            android:background="@color/colorPrimary"
                             android:onClick="@{(v) -> viewModel.shareRoom()}"
                             android:text="@string/share_room_key_button"
                             android:textColor="@color/appWhite"
@@ -128,7 +128,7 @@
                             android:background="@null"
                             android:onClick="@{(v) -> viewModel.userReport()}"
                             android:text="@string/user_report_button"
-                            android:textColor="@color/appBlue"
+                            android:textColor="@color/colorPrimary"
                             android:textSize="14sp" />
                     </LinearLayout>
                 </LinearLayout>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 036d09bc..7353dbd1 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 036d09bc..7353dbd1 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 7d0bcf55..da550613 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
deleted file mode 100644
index 60171a62..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
index f96f24aa..1d3141a8 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-hdpi/logo.png b/app/src/main/res/mipmap-hdpi/logo.png
index 35c69eb4..2c4ee8f3 100644
Binary files a/app/src/main/res/mipmap-hdpi/logo.png and b/app/src/main/res/mipmap-hdpi/logo.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index f8966ee2..55262e0d 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
deleted file mode 100644
index cf58af31..00000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
index ffc4bd21..34d7273e 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-mdpi/logo.png b/app/src/main/res/mipmap-mdpi/logo.png
index 98948c36..71505cf2 100644
Binary files a/app/src/main/res/mipmap-mdpi/logo.png and b/app/src/main/res/mipmap-mdpi/logo.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 63a28b0a..c209109a 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 1e5a8f52..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
index 8409672b..9136505d 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/logo.png b/app/src/main/res/mipmap-xhdpi/logo.png
index fcef8861..431ab7af 100644
Binary files a/app/src/main/res/mipmap-xhdpi/logo.png and b/app/src/main/res/mipmap-xhdpi/logo.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 40e9d5e2..d4f797dc 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 16e1780d..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
index 5de6759c..74bb65ec 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/logo.png b/app/src/main/res/mipmap-xxhdpi/logo.png
index 7482289b..a52d9901 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/logo.png and b/app/src/main/res/mipmap-xxhdpi/logo.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 9d82cfc9..ec299189 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 258c0cd3..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
index 6790d871..e9d1ed3c 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/logo.png b/app/src/main/res/mipmap-xxxhdpi/logo.png
index 380eaa37..50836952 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/logo.png and b/app/src/main/res/mipmap-xxxhdpi/logo.png differ
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f81f801b..9f1b1f52 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimary">#F05C00</color>
     <color name="colorPrimaryDark">#303F9F</color>
     <color name="colorAccent">#FF4081</color>
+
     <color name="appBlue">#303F9F</color>
     <color name="appGreen">#00796B</color>
     <color name="appWhite">#fafafa</color>
+    <color name="appBeige">#ccbb9a</color>
+    <color name="appOrange">#F0B459</color>
     <color name="text">#222222</color>
+    <color name="on_beige_text">#3b4043</color>
     <color name="subtext">#666666</color>
     <color name="gray_text">#aaaaaa</color>
     <color name="notice_message">#90CAF9</color>
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
index 68dad0e6..89456ae3 100644
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#00796B</color>
+    <color name="ic_launcher_background">#F05C00</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9ba71dec..d041fb60 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,6 +2,11 @@
 
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:colorControlActivated">@color/appOrange</item>
+    </style>
+
+    <style name="SearchVideoTheme" parent="ThemeOverlay.AppCompat.ActionBar">
+        <item name="android:colorControlActivated">@color/appOrange</item>
     </style>
 
     <style name="SplashTheme" parent="AppTheme">