diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
index eea2358b2..7252e5eca 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
@@ -14,8 +14,6 @@ import eu.kanade.tachiyomi.ui.download.DownloadFragment
 import eu.kanade.tachiyomi.ui.library.LibraryFragment
 import eu.kanade.tachiyomi.ui.recent.RecentChaptersFragment
 import eu.kanade.tachiyomi.ui.setting.SettingsActivity
-import eu.kanade.tachiyomi.util.getResourceColor
-import eu.kanade.tachiyomi.util.setVectorCompat
 import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.toolbar.*
 
@@ -45,8 +43,7 @@ class MainActivity : BaseActivity() {
         // Set behavior of Navigation drawer
         nav_view.setNavigationItemSelectedListener { item ->
             // Make information view invisible
-            image_view.setImageResource(android.R.color.transparent)
-            text_label.text = ""
+            empty_view.hide()
 
             when (item.itemId) {
                 R.id.nav_drawer_library -> setFragment(LibraryFragment.newInstance())
@@ -91,12 +88,6 @@ class MainActivity : BaseActivity() {
     }
 
     fun updateEmptyView(show: Boolean, textResource: Int, drawable: Int) {
-        if (show) {
-            image_view.setVectorCompat(drawable, theme.getResourceColor(android.R.attr.textColorHint))
-            text_label.text = getString(textResource)
-        } else {
-            image_view.setImageResource(android.R.color.transparent)
-            text_label.text = ""
-        }
+        if (show) empty_view.show(drawable, textResource) else empty_view.hide()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/EmptyView.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/EmptyView.kt
new file mode 100644
index 000000000..0a3e8eb23
--- /dev/null
+++ b/app/src/main/java/eu/kanade/tachiyomi/widget/EmptyView.kt
@@ -0,0 +1,36 @@
+package eu.kanade.tachiyomi.widget
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.widget.RelativeLayout
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.util.getResourceColor
+import eu.kanade.tachiyomi.util.setVectorCompat
+import kotlinx.android.synthetic.main.view_empty.view.*
+
+class EmptyView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
+        RelativeLayout (context, attrs) {
+
+    init {
+        inflate(context, R.layout.view_empty, this)
+    }
+
+    /**
+     * Hide the information view
+     */
+    fun hide() {
+        this.visibility = View.GONE
+    }
+
+    /**
+     * Show the information view
+     * @param drawable icon of information view
+     * @param textResource text of information view
+     */
+    fun show(drawable: Int, textResource: Int) {
+        image_view.setVectorCompat(drawable, context.theme.getResourceColor(android.R.attr.textColorHint))
+        text_label.text = context.getString(textResource)
+        this.visibility = View.VISIBLE
+    }
+}
diff --git a/app/src/main/res/drawable-v21/library_item_selector_dark.xml b/app/src/main/res/drawable-v21/library_item_selector_dark.xml
new file mode 100644
index 000000000..e78c6ec16
--- /dev/null
+++ b/app/src/main/res/drawable-v21/library_item_selector_dark.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/colorAccentDark"
+    >
+    <item>
+        <selector>
+            <item android:state_selected="true">
+                <color android:color="@color/selectorColorDark"/>
+            </item>
+
+            <item android:state_activated="true">
+                <color android:color="@color/selectorColorDark"/>
+            </item>
+
+            <item>
+                <color android:color="@color/backgroundDark"/>
+            </item>
+        </selector>
+    </item>
+
+
+</ripple>
diff --git a/app/src/main/res/drawable-v21/library_item_selector_light.xml b/app/src/main/res/drawable-v21/library_item_selector_light.xml
new file mode 100644
index 000000000..c85ee3913
--- /dev/null
+++ b/app/src/main/res/drawable-v21/library_item_selector_light.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/colorAccentLight"
+    >
+    <item>
+        <selector>
+            <item android:state_selected="true">
+                <color android:color="@color/selectorColorLight"/>
+            </item>
+
+            <item android:state_activated="true">
+                <color android:color="@color/selectorColorLight"/>
+            </item>
+
+            <item>
+                <color android:color="@color/backgroundLight"/>
+            </item>
+        </selector>
+    </item>
+
+
+</ripple>
diff --git a/app/src/main/res/drawable-v21/list_item_selector_dark.xml b/app/src/main/res/drawable-v21/list_item_selector_dark.xml
index d1152832e..3757b9bf5 100644
--- a/app/src/main/res/drawable-v21/list_item_selector_dark.xml
+++ b/app/src/main/res/drawable-v21/list_item_selector_dark.xml
@@ -14,7 +14,7 @@
             </item>
 
             <item>
-                <color android:color="@color/backgroundDark" />
+                <color android:color="@color/dialogDark"/>
             </item>
         </selector>
     </item>
diff --git a/app/src/main/res/drawable-v21/list_item_selector_light.xml b/app/src/main/res/drawable-v21/list_item_selector_light.xml
index d17e5bf43..ab9d9b675 100644
--- a/app/src/main/res/drawable-v21/list_item_selector_light.xml
+++ b/app/src/main/res/drawable-v21/list_item_selector_light.xml
@@ -14,7 +14,7 @@
             </item>
 
             <item>
-                <color android:color="@color/backgroundLight" />
+                <color android:color="@color/dialogLight"/>
             </item>
         </selector>
     </item>
diff --git a/app/src/main/res/drawable/library_item_selector_dark.xml b/app/src/main/res/drawable/library_item_selector_dark.xml
new file mode 100644
index 000000000..73de4df07
--- /dev/null
+++ b/app/src/main/res/drawable/library_item_selector_dark.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector android:exitFadeDuration="@android:integer/config_longAnimTime"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_focused="true" android:drawable="@color/selectorColorDark"/>
+    <item android:state_pressed="true" android:drawable="@color/selectorColorDark"/>
+    <item android:state_activated="true" android:drawable="@color/selectorColorDark"/>
+    <item android:drawable="@color/backgroundDark"/>
+
+</selector>
diff --git a/app/src/main/res/drawable/library_item_selector_light.xml b/app/src/main/res/drawable/library_item_selector_light.xml
new file mode 100644
index 000000000..9273e00fe
--- /dev/null
+++ b/app/src/main/res/drawable/library_item_selector_light.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--<selector android:exitFadeDuration="@android:integer/config_longAnimTime"-->
+<!--xmlns:android="http://schemas.android.com/apk/res/android">-->
+
+<!--<item android:state_focused="true" android:drawable="?attr/colorAccent"/>-->
+<!--<item android:state_pressed="true" android:drawable="?attr/colorAccent"/>-->
+<!--<item android:state_activated="true" android:drawable="?attr/colorAccent"/>-->
+<!--<item android:drawable="?android:attr/colorBackground"/>-->
+<!--</selector>-->
+
+<selector android:exitFadeDuration="@android:integer/config_longAnimTime"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_focused="true" android:drawable="@color/selectorColorLight"/>
+    <item android:state_pressed="true" android:drawable="@color/selectorColorLight"/>
+    <item android:state_activated="true" android:drawable="@color/selectorColorLight"/>
+    <item android:drawable="@color/backgroundLight"/>
+
+</selector>
diff --git a/app/src/main/res/drawable/list_item_selector_dark.xml b/app/src/main/res/drawable/list_item_selector_dark.xml
index 2607d316f..97a108663 100644
--- a/app/src/main/res/drawable/list_item_selector_dark.xml
+++ b/app/src/main/res/drawable/list_item_selector_dark.xml
@@ -5,6 +5,6 @@
     <item android:state_focused="true" android:drawable="@color/selectorColorDark"/>
     <item android:state_pressed="true" android:drawable="@color/selectorColorDark"/>
     <item android:state_activated="true" android:drawable="@color/selectorColorDark"/>
-    <item android:drawable="@android:color/background_dark"/>
+    <item android:drawable="@color/dialogDark"/>
 
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/list_item_selector_light.xml b/app/src/main/res/drawable/list_item_selector_light.xml
index 4cb278d90..a33b89da0 100644
--- a/app/src/main/res/drawable/list_item_selector_light.xml
+++ b/app/src/main/res/drawable/list_item_selector_light.xml
@@ -14,6 +14,6 @@
     <item android:state_focused="true" android:drawable="@color/selectorColorLight"/>
     <item android:state_pressed="true" android:drawable="@color/selectorColorLight"/>
     <item android:state_activated="true" android:drawable="@color/selectorColorLight"/>
-    <item android:drawable="@color/backgroundLight"/>
+    <item android:drawable="@color/dialogLight"/>
 
 </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 f631b1d5e..f657d1dc0 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -41,27 +41,12 @@
             android:layout_height="match_parent"
             android:layout_below="@id/appbar">
 
-            <RelativeLayout
-                android:id="@+id/information_layout"
+            <eu.kanade.tachiyomi.widget.EmptyView
+                android:id="@+id/empty_view"
+                android:visibility="gone"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center">
-
-                <android.support.v7.widget.AppCompatImageView
-                    android:id="@+id/image_view"
-                    android:layout_width="128dp"
-                    android:layout_height="128dp"
-                    android:layout_centerHorizontal="true"/>
-
-                <TextView
-                    android:id="@+id/text_label"
-                    style="@style/TextAppearance.Medium.Body2.Hint"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/image_view"
-                    android:layout_centerHorizontal="true"/>
-
-            </RelativeLayout>
+                android:layout_gravity="center"
+                android:layout_height="wrap_content"/>
 
         </FrameLayout>
     </RelativeLayout>
diff --git a/app/src/main/res/layout/card_myanimelist_personal.xml b/app/src/main/res/layout/card_myanimelist_personal.xml
index d071cde75..6a6141447 100644
--- a/app/src/main/res/layout/card_myanimelist_personal.xml
+++ b/app/src/main/res/layout/card_myanimelist_personal.xml
@@ -1,142 +1,151 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<android.support.v7.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/cv_mal"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:layout_margin="@dimen/card_margin"
+    >
 
     <RelativeLayout
-        android:id="@+id/myanimelist_title_layout"
         android:layout_width="match_parent"
-        android:layout_height="?android:listPreferredItemHeightSmall"
-        android:background="?attr/selectable_list_drawable"
-        android:clickable="true"
-        android:paddingLeft="?android:listPreferredItemPaddingLeft"
-        android:paddingRight="?android:listPreferredItemPaddingRight">
+        android:layout_height="wrap_content"
+        android:padding="@dimen/card_margin">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:text="Title"
-            style="@style/TextAppearance.Regular.Body1"/>
+        <RelativeLayout
+            android:id="@+id/myanimelist_title_layout"
+            android:layout_width="match_parent"
+            android:layout_height="?android:listPreferredItemHeightSmall"
+            android:background="?attr/selectable_list_drawable"
+            android:clickable="true"
+            android:paddingLeft="?android:listPreferredItemPaddingLeft"
+            android:paddingRight="?android:listPreferredItemPaddingRight">
 
-        <TextView
-            android:id="@+id/myanimelist_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:text="@string/action_edit"
-            style="@style/TextAppearance.Medium.Button"/>
+            <TextView
+                style="@style/TextAppearance.Regular.Body1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:text="Title"/>
+
+            <TextView
+                android:id="@+id/myanimelist_title"
+                style="@style/TextAppearance.Medium.Button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:text="@string/action_edit"/>
+
+        </RelativeLayout>
+
+        <View
+            android:id="@+id/divider1"
+            android:layout_width="fill_parent"
+            android:layout_height="1dp"
+            android:layout_below="@id/myanimelist_title_layout"
+            android:background="?android:attr/divider"/>
+
+        <RelativeLayout
+            android:id="@+id/myanimelist_status_layout"
+            android:layout_width="match_parent"
+            android:layout_height="?android:listPreferredItemHeightSmall"
+            android:layout_below="@id/divider1"
+            android:background="?attr/selectable_list_drawable"
+            android:clickable="true"
+            android:paddingLeft="?android:listPreferredItemPaddingLeft"
+            android:paddingRight="?android:listPreferredItemPaddingRight"
+            >
+
+            <TextView
+                style="@style/TextAppearance.Regular.Body1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:text="Status"/>
+
+            <TextView
+                android:id="@+id/myanimelist_status"
+                style="@style/TextAppearance.Regular.Body1.Secondary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                tools:text="Reading"/>
+
+        </RelativeLayout>
+
+        <View
+            android:id="@+id/divider2"
+            android:layout_width="fill_parent"
+            android:layout_height="1dp"
+            android:layout_below="@id/myanimelist_status_layout"
+            android:background="?android:attr/divider"/>
+
+        <RelativeLayout
+            android:id="@+id/myanimelist_chapters_layout"
+            android:layout_width="match_parent"
+            android:layout_height="?android:listPreferredItemHeightSmall"
+            android:layout_below="@id/divider2"
+            android:background="?attr/selectable_list_drawable"
+            android:clickable="true"
+            android:paddingLeft="?android:listPreferredItemPaddingLeft"
+            android:paddingRight="?android:listPreferredItemPaddingRight">
+
+            <TextView
+                style="@style/TextAppearance.Regular.Body1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:text="Chapters"/>
+
+            <TextView
+                android:id="@+id/myanimelist_chapters"
+                style="@style/TextAppearance.Regular.Body1.Secondary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                tools:text="12/24"/>
+
+        </RelativeLayout>
+
+        <View
+            android:id="@+id/divider3"
+            android:layout_width="fill_parent"
+            android:layout_height="1dp"
+            android:layout_below="@id/myanimelist_chapters_layout"
+            android:background="?android:attr/divider"/>
+
+        <RelativeLayout
+            android:id="@+id/myanimelist_score_layout"
+            android:layout_width="match_parent"
+            android:layout_height="?android:listPreferredItemHeightSmall"
+            android:layout_below="@id/divider3"
+            android:background="?attr/selectable_list_drawable"
+            android:clickable="true"
+            android:paddingLeft="?android:listPreferredItemPaddingLeft"
+            android:paddingRight="?android:listPreferredItemPaddingRight">
+
+            <TextView
+                style="@style/TextAppearance.Regular.Body1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:text="@string/score"/>
+
+            <TextView
+                android:id="@+id/myanimelist_score"
+                style="@style/TextAppearance.Regular.Body1.Secondary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                tools:text="10"/>
+
+        </RelativeLayout>
 
     </RelativeLayout>
 
-    <View
-        android:id="@+id/divider1"
-        android:layout_width="fill_parent"
-        android:layout_height="1dp"
-        android:layout_below="@id/myanimelist_title_layout"
-        android:background="?android:attr/divider" />
-
-    <RelativeLayout
-        android:id="@+id/myanimelist_status_layout"
-        android:layout_width="match_parent"
-        android:layout_height="?android:listPreferredItemHeightSmall"
-        android:layout_below="@id/divider1"
-        android:background="?attr/selectable_list_drawable"
-        android:clickable="true"
-        android:paddingLeft="?android:listPreferredItemPaddingLeft"
-        android:paddingRight="?android:listPreferredItemPaddingRight"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:text="Status"
-            style="@style/TextAppearance.Regular.Body1"/>
-
-        <TextView
-            android:id="@+id/myanimelist_status"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            tools:text="Reading"
-            style="@style/TextAppearance.Regular.Body1.Secondary"/>
-
-    </RelativeLayout>
-
-    <View
-        android:id="@+id/divider2"
-        android:layout_width="fill_parent"
-        android:layout_height="1dp"
-        android:layout_below="@id/myanimelist_status_layout"
-        android:background="?android:attr/divider" />
-
-    <RelativeLayout
-        android:id="@+id/myanimelist_chapters_layout"
-        android:layout_width="match_parent"
-        android:layout_height="?android:listPreferredItemHeightSmall"
-        android:layout_below="@id/divider2"
-        android:background="?attr/selectable_list_drawable"
-        android:clickable="true"
-        android:paddingLeft="?android:listPreferredItemPaddingLeft"
-        android:paddingRight="?android:listPreferredItemPaddingRight">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:text="Chapters"
-            style="@style/TextAppearance.Regular.Body1"/>
-
-        <TextView
-            android:id="@+id/myanimelist_chapters"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            tools:text="12/24"
-            style="@style/TextAppearance.Regular.Body1.Secondary"/>
-
-    </RelativeLayout>
-
-    <View
-        android:id="@+id/divider3"
-        android:layout_width="fill_parent"
-        android:layout_height="1dp"
-        android:layout_below="@id/myanimelist_chapters_layout"
-        android:background="?android:attr/divider" />
-
-    <RelativeLayout
-        android:id="@+id/myanimelist_score_layout"
-        android:layout_width="match_parent"
-        android:layout_height="?android:listPreferredItemHeightSmall"
-        android:layout_below="@id/divider3"
-        android:background="?attr/selectable_list_drawable"
-        android:clickable="true"
-        android:paddingLeft="?android:listPreferredItemPaddingLeft"
-        android:paddingRight="?android:listPreferredItemPaddingRight">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:text="@string/score"
-            style="@style/TextAppearance.Regular.Body1"/>
-
-        <TextView
-            android:id="@+id/myanimelist_score"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            tools:text="10"
-            style="@style/TextAppearance.Regular.Body1.Secondary"/>
-
-    </RelativeLayout>
-
-
-</RelativeLayout>
\ No newline at end of file
+</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_myanimelist.xml b/app/src/main/res/layout/fragment_myanimelist.xml
index 76d5fcfb4..233a3cb18 100644
--- a/app/src/main/res/layout/fragment_myanimelist.xml
+++ b/app/src/main/res/layout/fragment_myanimelist.xml
@@ -4,23 +4,13 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingBottom="@dimen/margin_bottom"
-    android:paddingLeft="@dimen/margin_left"
-    android:paddingRight="@dimen/margin_right"
-    android:paddingTop="@dimen/margin_top">
+    android:orientation="vertical">
 
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <android.support.v7.widget.CardView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <include layout="@layout/card_myanimelist_personal"/>
-
-        </android.support.v7.widget.CardView>
+        <include layout="@layout/card_myanimelist_personal"/>
 
     </ScrollView>
 
diff --git a/app/src/main/res/layout/item_catalogue_grid.xml b/app/src/main/res/layout/item_catalogue_grid.xml
index ba1ffcb5c..4027c126c 100644
--- a/app/src/main/res/layout/item_catalogue_grid.xml
+++ b/app/src/main/res/layout/item_catalogue_grid.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/selectable_list_drawable">
+    android:background="?attr/selectable_library_drawable">
 
     <FrameLayout
         android:layout_width="wrap_content"
@@ -26,7 +26,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
-            android:background="@drawable/gradient_shape" />
+            android:background="@drawable/gradient_shape"/>
 
         <TextView
             android:id="@+id/unread_text"
diff --git a/app/src/main/res/layout/view_empty.xml b/app/src/main/res/layout/view_empty.xml
new file mode 100644
index 000000000..ef3cb1416
--- /dev/null
+++ b/app/src/main/res/layout/view_empty.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <android.support.v7.widget.AppCompatImageView
+        android:id="@+id/image_view"
+        android:layout_width="128dp"
+        android:layout_height="128dp"
+        android:layout_centerHorizontal="true"/>
+
+    <TextView
+        android:id="@+id/text_label"
+        style="@style/TextAppearance.Medium.Body2.Hint"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/image_view"
+        android:layout_centerHorizontal="true"/>
+
+</RelativeLayout>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 515647a5d..450783da1 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -19,5 +19,6 @@
 
     <attr name="navigation_view_theme" format="reference"/>
     <attr name="selectable_list_drawable" format="reference|integer" />
+    <attr name="selectable_library_drawable" format="reference|integer"/>
     <attr name="divider_drawable" format="reference|integer" />
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index c97adead6..28bfe2212 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -7,6 +7,7 @@
     <dimen name="margin_left">16dp</dimen>
     <dimen name="margin_right">16dp</dimen>
     <dimen name="fab_margin">16dp</dimen>
+    <dimen name="card_margin">16dp</dimen>
     <dimen name="fab_size">56dp</dimen>
 
     <dimen name="dialog_content_padding">24dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 00d8fffec..975aef227 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -4,11 +4,14 @@
     <!--========-->
     <!--Toolbars-->
     <!--========-->
-    <style name="Theme.ActionBar" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
-        <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
+    <style name="Theme.ActionBar" parent="@style/ThemeOverlay.AppCompat.ActionBar">
         <item name="android:spinnerDropDownItemStyle">@style/ActionBarSpinnerItem</item>
     </style>
 
+    <style name="Theme.ActionBar.Light" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+        <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
+    </style>
+
     <!--====-->
     <!--Tabs-->
     <!--====-->
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 8518fd71f..4994a7c86 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -25,13 +25,12 @@
 
         <!-- Themes -->
         <item name="windowActionModeOverlay">true</item>
-        <item name="actionModeBackground">?colorPrimaryDark</item>
-        <item name="actionBarTheme">@style/Theme.ActionBar</item>
-        <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
+        <item name="actionBarTheme">@style/Theme.ActionBar.Light</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
 
         <!-- Custom Attributes-->
         <item name="selectable_list_drawable">@drawable/list_item_selector_light</item>
+        <item name="selectable_library_drawable">@drawable/library_item_selector_light</item>
         <item name="divider_drawable">@drawable/line_divider_light</item>
     </style>
 
@@ -58,7 +57,6 @@
 
         <!-- Themes -->
         <item name="windowActionModeOverlay">true</item>
-        <item name="actionModeBackground">?colorPrimaryDark</item>
         <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
@@ -66,6 +64,7 @@
         <!-- Custom Attributes-->
         <item name="navigation_view_theme">@style/Theme.Widget.NavigationView.Dark</item>
         <item name="selectable_list_drawable">@drawable/list_item_selector_dark</item>
+        <item name="selectable_library_drawable">@drawable/library_item_selector_dark</item>
         <item name="divider_drawable">@drawable/line_divider_dark</item>
     </style>