diff --git a/Clover/app/build.gradle b/Clover/app/build.gradle
index e5840dd1..1b32f719 100644
--- a/Clover/app/build.gradle
+++ b/Clover/app/build.gradle
@@ -68,7 +68,7 @@ android {
 
 dependencies {
     compile 'com.android.support:support-v13:21.0.0'
-    compile 'com.android.support:appcompat-v7:21.0.2'
+    compile 'com.android.support:appcompat-v7:21.0.3'
     compile 'com.android.support:support-v13:18.0.0'
 
     compile 'org.jsoup:jsoup:1.8.1'
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/activity/ChanActivity.java b/Clover/app/src/main/java/org/floens/chan/ui/activity/ChanActivity.java
index bc8c0164..aa0408c6 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/activity/ChanActivity.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/activity/ChanActivity.java
@@ -91,7 +91,7 @@ public class ChanActivity extends BaseActivity implements AdapterView.OnItemSele
 
         final ActionBar actionBar = getSupportActionBar();
 
-        boardSpinner = new Spinner(actionBar.getThemedContext());
+        boardSpinner = new Spinner(this, null, R.attr.test_spinner_style);
         spinnerAdapter = new BoardSpinnerAdapter(this, boardSpinner);
         boardSpinner.setAdapter(spinnerAdapter);
         boardSpinner.setOnItemSelectedListener(this);
diff --git a/Clover/app/src/main/res/layout/header_switch_layout.xml b/Clover/app/src/main/res/layout/header_switch_layout.xml
index 98681879..991ee74b 100644
--- a/Clover/app/src/main/res/layout/header_switch_layout.xml
+++ b/Clover/app/src/main/res/layout/header_switch_layout.xml
@@ -16,51 +16,43 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <include layout="@layout/toolbar" />
 
-    <FrameLayout
+    <LinearLayout
         android:id="@+id/toggle_bar"
         android:layout_width="match_parent"
         android:layout_height="56dp"
-        android:background="?attr/selectableItemBackground"
-        android:clickable="true">
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="#ff9e9e9e">
-
-            <TextView
-                android:layout_gravity="center_vertical"
-                android:id="@+id/toggle_status"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:layout_marginLeft="24dp"
-                android:layout_marginRight="6dip"
-                android:layout_marginTop="6dip"
-                android:layout_marginBottom="6dip"
-                android:singleLine="true"
-                android:textColor="#ffffffff"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-
-            <android.support.v7.widget.SwitchCompat
-                android:layout_gravity="center_vertical"
-                android:id="@+id/toggle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingRight="20dp"
-                android:focusable="false"
-                android:clickable="true" />
-
-        </LinearLayout>
-
-    </FrameLayout>
+        android:background="#ff9e9e9e"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/toggle_status"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginBottom="6dip"
+            android:layout_marginLeft="24dp"
+            android:layout_marginRight="6dip"
+            android:layout_marginTop="6dip"
+            android:layout_weight="1"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="#ffffffff" />
+
+        <android.support.v7.widget.SwitchCompat
+            android:id="@+id/toggle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:clickable="true"
+            android:focusable="false"
+            android:paddingRight="20dp" />
+
+    </LinearLayout>
 
     <FrameLayout
         android:id="@+id/content"
diff --git a/Clover/app/src/main/res/layout/toolbar.xml b/Clover/app/src/main/res/layout/toolbar.xml
index 515c54e6..8f4382cd 100644
--- a/Clover/app/src/main/res/layout/toolbar.xml
+++ b/Clover/app/src/main/res/layout/toolbar.xml
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     android:id="@+id/toolbar"
     android:layout_width="match_parent"
     android:layout_height="?attr/actionBarSize"
-    android:minHeight="?attr/actionBarSize"
     android:background="?attr/colorPrimary"
-    app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-    app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+    android:minHeight="?attr/actionBarSize"
+    app:popupTheme="?attr/toolbar_popup_theme"
+    app:theme="?attr/toolbar_theme" />
diff --git a/Clover/app/src/main/res/values/attrs.xml b/Clover/app/src/main/res/values/attrs.xml
index 70990203..0af82eaf 100644
--- a/Clover/app/src/main/res/values/attrs.xml
+++ b/Clover/app/src/main/res/values/attrs.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Clover - 4chan browser https://github.com/Floens/Clover/
 Copyright (C) 2014  Floens
 
@@ -17,60 +16,63 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <resources>
-    <attr name="board_pane_style" format="reference"/>
-    <attr name="board_pane_left_style" format="reference"/>
-    <attr name="board_pane_right_style" format="reference"/>
+    <attr name="toolbar_theme" format="reference" />
+    <attr name="toolbar_popup_theme" format="reference" />
+
+    <attr name="board_pane_style" format="reference" />
+    <attr name="board_pane_left_style" format="reference" />
+    <attr name="board_pane_right_style" format="reference" />
 
     <declare-styleable name="BoardPane">
-        <attr name="fade_color" format="color"/>
+        <attr name="fade_color" format="color" />
     </declare-styleable>
 
-    <attr name="post_style" format="reference"/>
+    <attr name="post_style" format="reference" />
 
     <declare-styleable name="PostView">
-        <attr name="thumbnail_background" format="color"/>
-        <attr name="saved_reply_color" format="color"/>
-        <attr name="highlighted_color" format="color"/>
-        <attr name="reply_count_color" format="color"/>
-        <attr name="name_color" format="color"/>
-        <attr name="subject_color" format="color"/>
-        <attr name="date_color" format="color"/>
-        <attr name="quote_color" format="color"/>
-        <attr name="highlight_quote_color" format="color"/>
-        <attr name="link_color" format="color"/>
-        <attr name="spoiler_color" format="color"/>
-        <attr name="capcode_color" format="color"/>
-        <attr name="id_background_light" format="color"/>
-        <attr name="id_background_dark" format="color"/>
-        <attr name="inline_quote_color" format="color"/>
+        <attr name="thumbnail_background" format="color" />
+        <attr name="saved_reply_color" format="color" />
+        <attr name="highlighted_color" format="color" />
+        <attr name="reply_count_color" format="color" />
+        <attr name="name_color" format="color" />
+        <attr name="subject_color" format="color" />
+        <attr name="date_color" format="color" />
+        <attr name="quote_color" format="color" />
+        <attr name="highlight_quote_color" format="color" />
+        <attr name="link_color" format="color" />
+        <attr name="spoiler_color" format="color" />
+        <attr name="capcode_color" format="color" />
+        <attr name="id_background_light" format="color" />
+        <attr name="id_background_dark" format="color" />
+        <attr name="inline_quote_color" format="color" />
 
-        <attr name="title_size" format="dimension"/>
-        <attr name="detail_size" format="dimension"/>
-        <attr name="icon_padding" format="dimension"/>
-        <attr name="icon_width" format="dimension"/>
-        <attr name="icon_height" format="dimension"/>
-        <attr name="options_spacing" format="dimension"/>
-        <attr name="options_left_padding" format="dimension"/>
-        <attr name="options_top_padding" format="dimension"/>
-        <attr name="options_right_padding" format="dimension"/>
-        <attr name="options_bottom_padding" format="dimension"/>
-        <attr name="last_seen_height" format="dimension"/>
-        <attr name="grid_padding" format="dimension"/>
-        <attr name="grid_image_size" format="dimension"/>
-        <attr name="grid_comment_padding" format="dimension"/>
-        <attr name="grid_replies_count_size" format="dimension"/>
-        <attr name="list_comment_max_height" format="dimension"/>
-        <attr name="list_padding" format="dimension"/>
-        <attr name="list_image_size" format="dimension"/>
-        <attr name="list_comment_padding" format="dimension"/>
-        <attr name="list_replies_count_size" format="dimension"/>
-        <attr name="grid_width" format="dimension"/>
-        <attr name="grid_height" format="dimension"/>
-        <attr name="grid_spacing" format="dimension"/>
+        <attr name="title_size" format="dimension" />
+        <attr name="detail_size" format="dimension" />
+        <attr name="icon_padding" format="dimension" />
+        <attr name="icon_width" format="dimension" />
+        <attr name="icon_height" format="dimension" />
+        <attr name="options_spacing" format="dimension" />
+        <attr name="options_left_padding" format="dimension" />
+        <attr name="options_top_padding" format="dimension" />
+        <attr name="options_right_padding" format="dimension" />
+        <attr name="options_bottom_padding" format="dimension" />
+        <attr name="last_seen_height" format="dimension" />
+        <attr name="grid_padding" format="dimension" />
+        <attr name="grid_image_size" format="dimension" />
+        <attr name="grid_comment_padding" format="dimension" />
+        <attr name="grid_replies_count_size" format="dimension" />
+        <attr name="list_comment_max_height" format="dimension" />
+        <attr name="list_padding" format="dimension" />
+        <attr name="list_image_size" format="dimension" />
+        <attr name="list_comment_padding" format="dimension" />
+        <attr name="list_replies_count_size" format="dimension" />
+        <attr name="grid_width" format="dimension" />
+        <attr name="grid_height" format="dimension" />
+        <attr name="grid_spacing" format="dimension" />
 
-        <attr name="code_tag_size" format="dimension"/>
+        <attr name="code_tag_size" format="dimension" />
 
     </declare-styleable>
 
-    <attr name="board_edit_item_style" format="reference"/>
+    <attr name="board_edit_item_style" format="reference" />
 </resources>
diff --git a/Clover/app/src/main/res/values/styles.xml b/Clover/app/src/main/res/values/styles.xml
index 6a400c8e..627003da 100644
--- a/Clover/app/src/main/res/values/styles.xml
+++ b/Clover/app/src/main/res/values/styles.xml
@@ -42,8 +42,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         <item name="board_edit_item_style">@style/BoardEditItem</item>
 
         <item name="android:textColor">#ff000000</item>
-    </style>
 
+        <item name="toolbar_theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
+        <item name="toolbar_popup_theme">@style/ThemeOverlay.AppCompat.Light</item>
+    </style>
 
     <!-- Dark theme -->
     <style name="AppTheme.Dark" parent="android:Theme.Holo">
@@ -81,7 +83,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     </style>
 
     <style name="BoardRightPane">
-        <item name="android:background">#FFE5E5E5</item>
+        <item name="android:background">#FFFFFFFF</item>
     </style>
 
     <style name="PostView">