diff --git a/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/App.kt b/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/App.kt
index 421273cc..edcb2f7f 100644
--- a/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/App.kt
+++ b/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/App.kt
@@ -3,6 +3,7 @@ package io.github.droidkaigi.confsched2018.presentation
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.support.multidex.MultiDexApplication
+import android.support.v7.app.AppCompatDelegate
 import com.facebook.stetho.Stetho
 import com.google.firebase.FirebaseApp
 import com.google.firebase.firestore.FirebaseFirestore
@@ -22,6 +23,7 @@ open class App : MultiDexApplication(), HasActivityInjector {
         super.onCreate()
         setupTimber()
         setupFirebase()
+        setupVectorDrawable()
         setupThreeTenABP()
         setupLeakCanary()
         setupDagger()
@@ -42,6 +44,10 @@ open class App : MultiDexApplication(), HasActivityInjector {
         }
     }
 
+    private fun setupVectorDrawable() {
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
+    }
+
     private fun setupThreeTenABP() {
         AndroidThreeTen.init(this)
     }
diff --git a/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/common/binding/ImageBinding.kt b/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/common/binding/ImageBinding.kt
index ce3a7f25..4e13af65 100644
--- a/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/common/binding/ImageBinding.kt
+++ b/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/common/binding/ImageBinding.kt
@@ -1,7 +1,11 @@
 package io.github.droidkaigi.confsched2018.presentation.common.binding
 
+import android.databinding.BindingAdapter
 import android.databinding.BindingMethod
 import android.databinding.BindingMethods
+import android.graphics.drawable.Drawable
+import android.support.annotation.ColorInt
+import android.support.v4.graphics.drawable.DrawableCompat
 import android.widget.ImageView
 
 @BindingMethods(
@@ -10,3 +14,10 @@ import android.widget.ImageView
                 method = "setImageDrawable"))
 class ImageBinding {}
 
+@BindingAdapter("bind:colorTint", "app:srcCompat")
+fun ImageView.setColorTint(@ColorInt color: Int, drawable: Drawable) {
+    drawable ?: return
+    val wrappedDrawable = DrawableCompat.wrap(drawable.mutate())
+    DrawableCompat.setTint(wrappedDrawable, color)
+    setImageDrawable(wrappedDrawable)
+}
diff --git a/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/favorite/FavoriteSessionsFragment.kt b/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/favorite/FavoriteSessionsFragment.kt
index 9b651637..ac95e8ea 100644
--- a/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/favorite/FavoriteSessionsFragment.kt
+++ b/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/favorite/FavoriteSessionsFragment.kt
@@ -9,6 +9,7 @@ import android.support.transition.TransitionManager
 import android.support.v4.app.Fragment
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
+import android.support.v7.widget.SimpleItemAnimator
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -95,6 +96,7 @@ class FavoriteSessionsFragment : Fragment(), Injectable {
         }
         binding.sessionsRecycler.apply {
             adapter = groupAdapter
+            (itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
 
             addOnScrollListener(
                     onScrollStateChanged = { _: RecyclerView?, newState: Int ->
diff --git a/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/search/SearchFragment.kt b/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/search/SearchFragment.kt
index cb1c8c54..f3c01799 100644
--- a/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/search/SearchFragment.kt
+++ b/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/search/SearchFragment.kt
@@ -14,6 +14,7 @@ import android.support.v4.app.FragmentStatePagerAdapter
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.support.v7.widget.SearchView
+import android.support.v7.widget.SimpleItemAnimator
 import android.view.*
 import com.xwray.groupie.GroupAdapter
 import com.xwray.groupie.ViewHolder
@@ -95,6 +96,7 @@ class SearchFragment : Fragment(), Injectable {
         }
         binding.sessionsRecycler.apply {
             adapter = groupAdapter
+            (itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
 
             addOnScrollListener(
                     onScrollStateChanged = { _: RecyclerView?, newState: Int ->
diff --git a/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/search/item/HorizontalSessionItem.kt b/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/search/item/HorizontalSessionItem.kt
index cb785d57..b1381220 100644
--- a/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/search/item/HorizontalSessionItem.kt
+++ b/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/search/item/HorizontalSessionItem.kt
@@ -11,7 +11,7 @@ import io.github.droidkaigi.confsched2018.model.Session
 import io.github.droidkaigi.confsched2018.util.CustomGlideApp
 import io.github.droidkaigi.confsched2018.util.ViewSizeCalculator.calculateViewSizeByScreenAndCount
 import io.github.droidkaigi.confsched2018.util.ext.context
-import io.github.droidkaigi.confsched2018.util.ext.getDisplaySize
+import io.github.droidkaigi.confsched2018.util.ext.displaySize
 import io.github.droidkaigi.confsched2018.util.ext.getFloat
 import io.github.droidkaigi.confsched2018.util.ext.toGone
 import io.github.droidkaigi.confsched2018.util.lang
@@ -29,7 +29,7 @@ class HorizontalSessionItem(
         val binding = viewHolder.binding
 
         val width = calculateViewSizeByScreenAndCount(
-                binding.context.getDisplaySize().width,
+                binding.context.displaySize().width,
                 binding.context.resources.getFloat(R.dimen.horizontal_visible_item_count))
         itemView.layoutParams.width = width
         return viewHolder
@@ -85,5 +85,4 @@ class HorizontalSessionItem(
         return session.hashCode()
     }
 
-
 }
diff --git a/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/sessions/AllSessionsFragment.kt b/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/sessions/AllSessionsFragment.kt
index 506d868b..0ac7ad64 100644
--- a/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/sessions/AllSessionsFragment.kt
+++ b/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/sessions/AllSessionsFragment.kt
@@ -9,6 +9,7 @@ import android.support.transition.TransitionManager
 import android.support.v4.app.Fragment
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
+import android.support.v7.widget.SimpleItemAnimator
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -27,6 +28,7 @@ import io.github.droidkaigi.confsched2018.util.ext.setTextIfChanged
 import timber.log.Timber
 import javax.inject.Inject
 
+
 class AllSessionsFragment : Fragment(), Injectable {
 
     private lateinit var binding: FragmentAllSessionsBinding
@@ -95,6 +97,7 @@ class AllSessionsFragment : Fragment(), Injectable {
         }
         binding.sessionsRecycler.apply {
             adapter = groupAdapter
+            (itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
 
             addOnScrollListener(
                     onScrollStateChanged = { _: RecyclerView?, newState: Int ->
diff --git a/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/sessions/RoomSessionsFragment.kt b/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/sessions/RoomSessionsFragment.kt
index 3443f3c5..341e101a 100644
--- a/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/sessions/RoomSessionsFragment.kt
+++ b/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/sessions/RoomSessionsFragment.kt
@@ -9,6 +9,7 @@ import android.support.transition.TransitionManager
 import android.support.v4.app.Fragment
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
+import android.support.v7.widget.SimpleItemAnimator
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -103,6 +104,7 @@ class RoomSessionsFragment : Fragment(), Injectable {
         }
         binding.sessionsRecycler.apply {
             adapter = groupAdapter
+            (itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
 
             addOnScrollListener(
                     onScrollStateChanged = { _: RecyclerView?, newState: Int ->
diff --git a/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/sessions/item/SessionItem.kt b/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/sessions/item/SessionItem.kt
index cecc017e..59091dce 100644
--- a/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/sessions/item/SessionItem.kt
+++ b/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/sessions/item/SessionItem.kt
@@ -21,7 +21,7 @@ data class SessionItem(
 
     override fun bind(viewBinding: ItemSessionBinding, position: Int) {
         viewBinding.session = session
-        viewBinding.topic.text = session.topic.getNameByLang(lang())
+        viewBinding.topic.text = session.topic.name
         viewBinding.level.text = session.level.getNameByLang(lang())
         val speakerImages = arrayOf(
                 viewBinding.speakerImage1,
diff --git a/app/src/main/java/io/github/droidkaigi/confsched2018/util/ext/ContextExt.kt b/app/src/main/java/io/github/droidkaigi/confsched2018/util/ext/ContextExt.kt
index 1eca1744..136cb66b 100644
--- a/app/src/main/java/io/github/droidkaigi/confsched2018/util/ext/ContextExt.kt
+++ b/app/src/main/java/io/github/droidkaigi/confsched2018/util/ext/ContextExt.kt
@@ -2,14 +2,17 @@ package io.github.droidkaigi.confsched2018.util.ext
 
 import android.content.Context
 import android.graphics.Point
+import android.support.annotation.ColorRes
+import android.support.v4.content.ContextCompat
 import android.view.WindowManager
 
-
-fun Context.getDisplaySize(): Size {
+fun Context.displaySize(): Size {
     val point = Point()
     val manager = getSystemService(Context.WINDOW_SERVICE) as WindowManager
     manager.defaultDisplay.getSize(point)
     return Size(point.x, point.y)
 }
 
+fun Context.color(@ColorRes color: Int): Int = ContextCompat.getColor(this, color)
+
 data class Size(val width: Int, val height: Int)
diff --git a/app/src/main/res/drawable/ic_filter_list_black_24dp.xml b/app/src/main/res/drawable/ic_filter_list_white_24dp.xml
similarity index 88%
rename from app/src/main/res/drawable/ic_filter_list_black_24dp.xml
rename to app/src/main/res/drawable/ic_filter_list_white_24dp.xml
index ebaf89de..e4df2490 100644
--- a/app/src/main/res/drawable/ic_filter_list_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_filter_list_white_24dp.xml
@@ -5,7 +5,7 @@
     android:viewportWidth="24.0"
     >
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#000"
         android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"
         />
 </vector>
diff --git a/app/src/main/res/drawable/shape_circle_button.xml b/app/src/main/res/drawable/shape_circle_button.xml
new file mode 100644
index 00000000..871e1824
--- /dev/null
+++ b/app/src/main/res/drawable/shape_circle_button.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval"
+    >
+    <solid android:color="@color/circle_button_background" />
+</shape>
diff --git a/app/src/main/res/drawable/shape_round_corner.xml b/app/src/main/res/drawable/shape_round_corner.xml
index 6e044b13..87fad9c6 100644
--- a/app/src/main/res/drawable/shape_round_corner.xml
+++ b/app/src/main/res/drawable/shape_round_corner.xml
@@ -8,5 +8,5 @@
         android:topLeftRadius="30dp"
         android:topRightRadius="30dp"
         />
-    <solid android:color="@color/button_material_light" />
+    <solid android:color="@color/card_background_color" />
 </shape>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d53e0526..8cf3d7de 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -31,6 +31,7 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
+                app:titleTextColor="@color/app_bar_text_color"
                 />
 
             <FrameLayout
diff --git a/app/src/main/res/layout/fragment_all_sessions.xml b/app/src/main/res/layout/fragment_all_sessions.xml
index 8878d359..03c8bda0 100644
--- a/app/src/main/res/layout/fragment_all_sessions.xml
+++ b/app/src/main/res/layout/fragment_all_sessions.xml
@@ -13,23 +13,15 @@
 
         <TextView
             android:id="@+id/day_header"
+            style="@style/DayHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
-            android:background="@drawable/shape_round_corner"
-            android:elevation="4dp"
-            android:paddingBottom="6dp"
-            android:paddingEnd="8dp"
-            android:paddingStart="8dp"
-            android:paddingTop="8dp"
-            android:text="DAY1"
-            android:textColor="#fff"
-            android:textSize="16sp"
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:targetApi="lollipop"
+            tools:text="DAY1"
             />
 
         <android.support.v7.widget.RecyclerView
diff --git a/app/src/main/res/layout/fragment_room_sessions.xml b/app/src/main/res/layout/fragment_room_sessions.xml
index 6ffb1b1a..a00cec77 100644
--- a/app/src/main/res/layout/fragment_room_sessions.xml
+++ b/app/src/main/res/layout/fragment_room_sessions.xml
@@ -15,18 +15,10 @@
 
         <TextView
             android:id="@+id/day_header"
+            style="@style/DayHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
-            android:background="@drawable/shape_round_corner"
-            android:elevation="4dp"
-            android:paddingBottom="6dp"
-            android:paddingEnd="8dp"
-            android:paddingStart="8dp"
-            android:paddingTop="8dp"
             android:text="DAY1"
-            android:textColor="#fff"
-            android:textSize="16sp"
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index b3c56122..cac3030d 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -15,6 +15,7 @@
         >
         <android.support.design.widget.TabLayout
             android:id="@+id/tab_layout"
+            style="@style/TabLayout"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:background="?attr/colorPrimary"
@@ -37,17 +38,9 @@
 
         <TextView
             android:id="@+id/day_header"
+            style="@style/DayHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
-            android:background="@drawable/shape_round_corner"
-            android:elevation="4dp"
-            android:paddingBottom="6dp"
-            android:paddingEnd="8dp"
-            android:paddingStart="8dp"
-            android:paddingTop="8dp"
-            android:textColor="#fff"
-            android:textSize="16sp"
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_sessions.xml b/app/src/main/res/layout/fragment_sessions.xml
index 6085c1a4..dd6e8cc1 100644
--- a/app/src/main/res/layout/fragment_sessions.xml
+++ b/app/src/main/res/layout/fragment_sessions.xml
@@ -15,6 +15,7 @@
 
         <android.support.design.widget.TabLayout
             android:id="@+id/tab_layout"
+            style="@style/TabLayout"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:background="?attr/colorPrimary"
diff --git a/app/src/main/res/layout/item_horizontal_session.xml b/app/src/main/res/layout/item_horizontal_session.xml
index cd71e0ee..abea95f9 100644
--- a/app/src/main/res/layout/item_horizontal_session.xml
+++ b/app/src/main/res/layout/item_horizontal_session.xml
@@ -195,11 +195,8 @@
 
             <ImageView
                 android:id="@+id/favorite"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:contentDescription="@string/content_description_favorite_button"
-                android:padding="16dp"
-                android:scaleType="center"
+                style="@style/FavoriteButton"
+                app:colorTint="@{session.isFavorited ? @color/accent : @color/sub_icon_color}"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:srcCompat="@{session.isFavorited ? @drawable/ic_favorite_black_24dp : @drawable/ic_favorite_border_black_24dp}"
diff --git a/app/src/main/res/layout/item_session.xml b/app/src/main/res/layout/item_session.xml
index 2ed8a166..7e10829e 100644
--- a/app/src/main/res/layout/item_session.xml
+++ b/app/src/main/res/layout/item_session.xml
@@ -99,9 +99,9 @@
                 android:id="@+id/description"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="20dp"
+                android:layout_marginEnd="16dp"
                 android:layout_marginStart="12dp"
-                android:layout_marginTop="2dp"
+                android:layout_marginTop="12dp"
                 android:ellipsize="end"
                 android:maxLines="3"
                 android:text="@{session.desc}"
@@ -112,41 +112,18 @@
                 tools:text="Material is the metaphor A material metaphor is the unifying theory of a rationalized space and a system of motion. The material is grounded in tactile reality, inspired by the study of paper and ink, yet technologically advanced and open to imagination and magic."
                 />
 
-            <View
-                android:id="@+id/divider_top"
-                android:layout_width="0dp"
-                android:layout_height="1dp"
-                android:layout_marginEnd="12dp"
-                android:layout_marginStart="12dp"
-                android:layout_marginTop="12dp"
-                android:background="#21000000"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/description"
-                />
-
             <TextView
                 android:id="@+id/topic"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="16dp"
                 android:layout_marginStart="12dp"
-                android:layout_marginTop="12dp"
-                android:textAppearance="@style/TextAppearance.App.Body2"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/divider_top"
-                />
-
-            <View
-                android:id="@+id/divider_bottom"
-                android:layout_width="0dp"
-                android:layout_height="1dp"
-                android:layout_marginEnd="12dp"
-                android:layout_marginStart="12dp"
-                android:layout_marginTop="12dp"
-                android:background="#21000000"
+                android:layout_marginTop="16dp"
+                android:maxLines="2"
+                android:textAppearance="@style/TextAppearance.App.Caption"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/topic"
+                app:layout_constraintTop_toBottomOf="@id/description"
                 />
 
             <ImageView
@@ -206,15 +183,15 @@
                 android:id="@+id/speaker_image_1"
                 android:layout_width="@dimen/speaker_image"
                 android:layout_height="@dimen/speaker_image"
-                android:layout_marginBottom="12dp"
+                android:layout_marginBottom="16dp"
                 android:layout_marginStart="12dp"
-                android:layout_marginTop="12dp"
+                android:layout_marginTop="32dp"
                 android:contentDescription="@string/content_description_favorite_button"
                 android:padding="16dp"
                 android:scaleType="center"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/divider_bottom"
+                app:layout_constraintTop_toBottomOf="@id/topic"
                 tools:src="@drawable/ic_person_black_24dp"
                 />
 
@@ -235,14 +212,17 @@
 
             <ImageView
                 android:id="@+id/favorite"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/FavoriteButton"
+                android:layout_marginBottom="8dp"
+                android:layout_marginEnd="8dp"
                 android:contentDescription="@string/content_description_favorite_button"
                 android:padding="16dp"
                 android:scaleType="center"
+                app:colorTint="@{session.isFavorited ? @color/accent : @color/sub_icon_color}"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:srcCompat="@{session.isFavorited ? @drawable/ic_favorite_black_24dp : @drawable/ic_favorite_border_black_24dp}"
+                tools:src="@drawable/ic_favorite_black_24dp"
                 />
 
         </android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/menu/search.xml b/app/src/main/res/menu/search.xml
index 4e70d3a7..1b5c1e7c 100644
--- a/app/src/main/res/menu/search.xml
+++ b/app/src/main/res/menu/search.xml
@@ -10,7 +10,7 @@
         />
     <item
         android:id="@+id/action_filter"
-        android:icon="@drawable/ic_filter_list_black_24dp"
+        android:icon="@drawable/ic_filter_list_white_24dp"
         android:title="Filter"
         app:showAsAction="always"
         />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 0c1b301c..9c9a7a10 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,8 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
+    <color name="primary">#FBC812</color>
+    <color name="primary_dark">#FEAD22</color>
+    <color name="accent">#F57C00</color>
+
+    <color name="window_background">#f2f2f2</color>
+
+    <color name="day_header_text_color">#d7a611</color>
+    <color name="app_bar_text_color">#FFF</color>
+
+    <color name="card_background_color">#FFF</color>
+
+    <color name="sub_icon_color">#8a000000</color>
+    <color name="circle_button_background">#f6f6f6</color>
 
-    <color name="background">#f2f2f2</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 03f90016..0addaa04 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,12 +1,31 @@
 <resources>
 
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:windowBackground">@color/background</item>
+    <style name="TabLayout">
+        <item name="tabTextColor">?colorControlNormal</item>
+        <item name="tabSelectedTextColor">?colorControlNormal</item>
     </style>
 
+    <style name="DayHeader">
+        <item name="android:background">@drawable/shape_round_corner</item>
+        <item name="android:elevation">4dp</item>
+        <item name="android:textColor">@color/day_header_text_color</item>
+        <item name="android:fontFamily">@font/notosans_medium</item>
+        <item name="android:paddingBottom">6dp</item>
+        <item name="android:paddingEnd">8dp</item>
+        <item name="android:paddingStart">8dp</item>
+        <item name="android:paddingTop">8dp</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:layout_marginTop">12dp</item>
+    </style>
+
+    <style name="FavoriteButton">
+        <item name="android:background">?actionBarItemBackground</item>
+        <item name="android:layout_width">48dp</item>
+        <item name="android:layout_height">48dp</item>
+        <item name="android:contentDescription">@string/content_description_favorite_button</item>
+        <item name="android:padding">16dp</item>
+        <item name="android:scaleType">center</item>
+    </style>
+
+
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
new file mode 100644
index 00000000..59fd9aea
--- /dev/null
+++ b/app/src/main/res/values/themes.xml
@@ -0,0 +1,13 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryDark">@color/primary_dark</item>
+        <item name="colorAccent">@color/accent</item>
+        <item name="colorControlNormal">@color/app_bar_text_color</item>
+        <item name="android:windowBackground">@color/window_background</item>
+    </style>
+
+</resources>