diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
index 3f8d5cf8e..c7f1524da 100644
--- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
@@ -326,7 +326,9 @@ public class ComposeActivity extends BaseActivity {
             actionBar.setTitle(null);
             actionBar.setDisplayHomeAsUpEnabled(true);
             actionBar.setDisplayShowHomeEnabled(true);
-            actionBar.setHomeAsUpIndicator(R.drawable.ic_close_24dp);
+            Drawable closeIcon = ContextCompat.getDrawable(this, R.drawable.ic_close_24dp);
+            ThemeUtils.setDrawableTint(this, closeIcon, R.attr.compose_close_button_tint);
+            actionBar.setHomeAsUpIndicator(closeIcon);
         }
 
         SharedPreferences preferences = getSharedPreferences(
@@ -386,11 +388,7 @@ public class ComposeActivity extends BaseActivity {
             startingHideText = false;
         }
 
-        if (statusMarkSensitive) {
-            nsfwBtn.setTextColor(ContextCompat.getColor(this, R.color.color_accent_dark));
-        } else {
-            nsfwBtn.setTextColor(ContextCompat.getColor(this, R.color.image_button_dark));
-        }
+        updateNsfwButtonColor();
 
         Intent intent = getIntent();
         String[] mentionedUsernames = null;
@@ -487,11 +485,14 @@ public class ComposeActivity extends BaseActivity {
 
     private void toggleNsfw() {
         statusMarkSensitive = !statusMarkSensitive;
+        updateNsfwButtonColor();
+    }
 
+    private void updateNsfwButtonColor() {
         if (statusMarkSensitive) {
-            nsfwBtn.setTextColor(ContextCompat.getColor(this, R.color.color_accent_dark));
+            nsfwBtn.setTextColor(ThemeUtils.getColor(this, R.attr.compose_nsfw_button_selected_color));
         } else {
-            nsfwBtn.setTextColor(ContextCompat.getColor(this, R.color.image_button_dark));
+            nsfwBtn.setTextColor(ThemeUtils.getColor(this, R.attr.compose_nsfw_button_color));
         }
     }
 
@@ -862,10 +863,14 @@ public class ComposeActivity extends BaseActivity {
 
     private void enableMediaPicking() {
         pickBtn.setEnabled(true);
+        ThemeUtils.setDrawableTint(this, pickBtn.getDrawable(),
+                R.attr.compose_media_button_tint);
     }
 
     private void disableMediaPicking() {
         pickBtn.setEnabled(false);
+        ThemeUtils.setDrawableTint(this, pickBtn.getDrawable(),
+                R.attr.compose_media_button_disabled_tint);
     }
 
     private void addMediaToQueue(QueuedMedia.Type type, Bitmap preview, Uri uri, long mediaSize) {
@@ -1159,7 +1164,7 @@ public class ComposeActivity extends BaseActivity {
 
         if(!showMarkSensitive) {
             statusMarkSensitive = false;
-            nsfwBtn.setTextColor(ContextCompat.getColor(this, R.color.image_button_dark));
+            nsfwBtn.setTextColor(ThemeUtils.getColor(this, R.attr.compose_nsfw_button_color));
         }
 
         if(show) {
diff --git a/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java b/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java
index a47094772..d6201e28c 100644
--- a/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java
@@ -22,6 +22,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.v7.app.AppCompatActivity;
 import android.text.method.LinkMovementMethod;
 import android.view.View;
@@ -168,6 +169,11 @@ public class LoginActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("lightTheme", false)) {
+            setTheme(R.style.AppTheme_Light);
+        }
+
         setContentView(R.layout.activity_login);
         ButterKnife.bind(this);
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/StatusViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/StatusViewHolder.java
index ee1e4d749..5efa94fb2 100644
--- a/app/src/main/java/com/keylesspalace/tusky/StatusViewHolder.java
+++ b/app/src/main/java/com/keylesspalace/tusky/StatusViewHolder.java
@@ -274,6 +274,7 @@ class StatusViewHolder extends RecyclerView.ViewHolder {
         contentWarningDescription.setText(spoilerText);
         contentWarningBar.setVisibility(View.VISIBLE);
         content.setVisibility(View.GONE);
+        contentWarningButton.setChecked(false);
         contentWarningButton.setOnCheckedChangeListener(
                 new CompoundButton.OnCheckedChangeListener() {
                     @Override
diff --git a/app/src/main/res/drawable/favourite_active.xml b/app/src/main/res/drawable/favourite_active_dark.xml
similarity index 100%
rename from app/src/main/res/drawable/favourite_active.xml
rename to app/src/main/res/drawable/favourite_active_dark.xml
diff --git a/app/src/main/res/drawable/favourite_active_light.xml b/app/src/main/res/drawable/favourite_active_light.xml
new file mode 100644
index 000000000..cb9ff4ecf
--- /dev/null
+++ b/app/src/main/res/drawable/favourite_active_light.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/status_favourite_button_marked_light"
+        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_blocks.xml b/app/src/main/res/layout/activity_blocks.xml
index aec7c6264..a305a19fe 100644
--- a/app/src/main/res/layout/activity_blocks.xml
+++ b/app/src/main/res/layout/activity_blocks.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/activity_view_thread"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -16,8 +16,6 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:theme="@style/AppTheme.Account.AppBarLayout"
-            app:popupTheme="@style/AppTheme.Account.ToolbarPopupTheme.Dark"
             android:elevation="4dp"
             android:background="?attr/toolbar_background_color" />
 
diff --git a/app/src/main/res/layout/activity_compose.xml b/app/src/main/res/layout/activity_compose.xml
index 8183cea81..f5bbb3f93 100644
--- a/app/src/main/res/layout/activity_compose.xml
+++ b/app/src/main/res/layout/activity_compose.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/activity_compose"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -17,9 +16,7 @@
             android:layout_height="?attr/actionBarSize"
             android:layout_marginBottom="8dp"
             android:background="@android:color/transparent"
-            android:elevation="4dp"
-            android:theme="@style/AppTheme.Account.AppBarLayout"
-            app:popupTheme="@style/AppTheme.Account.ToolbarPopupTheme.Dark" />
+            android:elevation="4dp" />
 
         <LinearLayout
             android:id="@+id/compose_content_warning_bar"
@@ -110,7 +107,7 @@
                 android:paddingLeft="8dp"
                 android:paddingRight="8dp"
                 android:visibility="gone"
-                android:textColor="@color/image_button_dark"
+                android:textColor="?attr/compose_nsfw_button_color"
                 android:text="@string/toggle_nsfw" />
 
             <android.support.v4.widget.Space
diff --git a/app/src/main/res/layout/activity_favourites.xml b/app/src/main/res/layout/activity_favourites.xml
index 0cad8874c..2c22bd594 100644
--- a/app/src/main/res/layout/activity_favourites.xml
+++ b/app/src/main/res/layout/activity_favourites.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/activity_view_thread"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -17,8 +17,6 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:elevation="4dp"
-            android:theme="@style/AppTheme.Account.AppBarLayout"
-            app:popupTheme="@style/AppTheme.Account.ToolbarPopupTheme.Dark"
             android:background="?attr/toolbar_background_color" />
 
         <FrameLayout
diff --git a/app/src/main/res/layout/item_status.xml b/app/src/main/res/layout/item_status.xml
index 5525477f7..71281440b 100644
--- a/app/src/main/res/layout/item_status.xml
+++ b/app/src/main/res/layout/item_status.xml
@@ -267,12 +267,12 @@
         <com.varunest.sparkbutton.SparkButton
             android:layout_width="32dp"
             android:layout_height="32dp"
-            app:sparkbutton_activeImage="@drawable/favourite_active"
+            app:sparkbutton_activeImage="?attr/status_favourite_active_drawable"
             app:sparkbutton_inActiveImage="?attr/status_favourite_inactive_drawable"
             app:sparkbutton_iconSize="28dp"
             android:layout_gravity="center"
-            app:sparkbutton_primaryColor="@color/status_favourite_button_marked_light"
-            app:sparkbutton_secondaryColor="?attr/status_favourite_button_marked_tint"
+            app:sparkbutton_primaryColor="@color/status_favourite_button_marked_dark"
+            app:sparkbutton_secondaryColor="@color/status_favourite_button_marked_light"
             android:id="@+id/status_favourite" />
 
         <Space
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 8d99b4472..dad2758ea 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -18,25 +18,26 @@
     <attr name="image_button_style" format="reference" />
     <attr name="status_reblog_inactive_drawable" format="reference" />
     <attr name="status_reblog_disabled_drawable" format="reference" />
+    <attr name="status_favourite_active_drawable" format="reference" />
     <attr name="status_favourite_inactive_drawable" format="reference" />
-    <attr name="status_favourite_button_marked_tint" format="reference|color" />
     <attr name="content_warning_button" format="reference" />
     <attr name="sensitive_media_warning_background_color" format="reference|color" />
     <attr name="media_preview_unloaded_drawable" format="reference" />
     <attr name="status_divider_drawable" format="reference" />
     <attr name="tab_icon_selected_tint" format="reference|color" />
     <attr name="tab_page_margin_drawable" format="reference" />
-    <attr name="notification_content" format="reference" />
-    <attr name="notification_icon_tint" format="reference|color" />
     <attr name="account_header_background_color" format="reference|color" />
     <attr name="account_toolbar_icon_tint_uncollapsed" format="reference|color" />
     <attr name="account_toolbar_icon_tint_collapsed" format="reference|color" />
     <attr name="account_toolbar_popup_theme" format="reference" />
+    <attr name="compose_close_button_tint" format="reference|color" />
     <attr name="compose_media_button_tint" format="reference|color" />
     <attr name="compose_media_button_disabled_tint" format="reference|color" />
     <attr name="compose_mention_color" format="reference|color" />
     <attr name="compose_content_warning_bar_background" format="reference" />
     <attr name="compose_send_private_drawable" format="reference" />
+    <attr name="compose_nsfw_button_color" format="reference|color" />
+    <attr name="compose_nsfw_button_selected_color" format="reference|color" />
     <attr name="report_status_background_color" format="reference|color" />
     <attr name="report_status_divider_drawable" format="reference" />
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 4cb6dc0bc..c055d7236 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--These colors are not affected by themes.-->
-    <color name="splash_background">#4F4F4F</color>
     <color name="view_video_background">#000000</color>
     <!--Dark Theme Colors-->
     <color name="color_primary_dark">#4c5368</color>
@@ -27,7 +26,6 @@
     <color name="status_favourite_button_marked_dark">#ca8f04</color>
     <color name="sensitive_media_warning_background_dark">#303030</color>
     <color name="media_preview_unloaded_background_dark">#2F2F2F</color>
-    <color name="status_text_secondary_dark">#A4B4BC</color>
     <color name="status_divider_dark">#2f3441</color>
     <color name="tab_page_margin_dark">#4C534B</color>
     <color name="account_toolbar_icon_collapsed_dark">#FFFFFF</color>
@@ -35,44 +33,39 @@
     <color name="compose_media_button_dark">#FFFFFF</color>
     <color name="compose_media_button_disabled_dark">#8F8F8F</color>
     <color name="compose_mention_dark">#AFBFCF</color>
-    <color name="notification_content_faded_dark">#9F9F9F</color>
-    <color name="notification_icon_tint_dark">#CFCFCF</color>
     <color name="report_status_background_dark">#000000</color>
     <color name="report_status_divider_dark">#2F2F2F</color>
     <!--Light Theme Colors-->
-    <color name="color_primary_light">#44A673</color>
-    <color name="color_primary_dark_light">#2C996E</color>
-    <color name="color_accent_light">#3F8A65</color>
-    <color name="button_light">#79daa8</color>
-    <color name="color_background_light">#FFFFFF</color>
-    <color name="window_background_light">#FFFFFF</color>
+    <color name="color_primary_light">#dfdfdf</color>
+    <color name="color_primary_dark_light">#8f8f8f</color>
+    <color name="color_accent_light">#2b90d9</color>
+    <color name="button_light">#52a5e0</color>
+    <color name="color_background_light">#f4f4f4</color>
+    <color name="window_background_light">#f4f4f4</color>
     <color name="edit_text_color_light">#000000</color>
     <color name="text_color_primary_light">#000000</color>
-    <color name="text_color_secondary_light">#000000</color>
-    <color name="text_color_tertiary_light">#4f5f5f</color>
-    <color name="text_color_primary_inverse_light">#FFFFFF</color>
-    <color name="text_color_secondary_inverse_light">#FFFFFF</color>
-    <color name="text_color_tertiary_inverse_light">#FFFFFF</color>
+    <color name="text_color_secondary_light">#3c3c3c</color>
+    <color name="text_color_tertiary_light">#5f636f</color>
+    <color name="text_color_primary_inverse_light">#ffffff</color>
+    <color name="text_color_secondary_inverse_light">#ffffff</color>
+    <color name="text_color_tertiary_inverse_light">#ffffff</color>
     <color name="toolbar_background_light">#f6f7f7</color>
     <color name="toolbar_icon_light">#000000</color>
-    <color name="image_button_light">#4F4F4F</color>
-    <color name="status_reblog_button_light">#4F4F4F</color>
+    <color name="image_button_light">#4f4f4f</color>
+    <color name="status_reblog_button_light">#4f4f4f</color>
     <color name="status_reblog_button_marked_light">#56a7e1</color>
     <color name="status_reblog_button_disabled_light">#BFBFBF</color>
-    <color name="status_favourite_button_light">#4F4F4F</color>
+    <color name="status_favourite_button_light">#4f4f4f</color>
     <color name="status_favourite_button_marked_light">#fab207</color>
-    <color name="sensitive_media_warning_background_light">#B0B0B0</color>
-    <color name="media_preview_unloaded_background_light">#CFCFCF</color>
-    <color name="status_text_secondary_light">#34444C</color>
-    <color name="status_divider_light">#CFCFCF</color>
+    <color name="sensitive_media_warning_background_light">#b0b0b0</color>
+    <color name="media_preview_unloaded_background_light">#cfcfcf</color>
+    <color name="status_divider_light">#cfcfcf</color>
     <color name="tab_page_margin_light">#9F9F9F</color>
     <color name="account_toolbar_icon_collapsed_light">#000000</color>
     <color name="account_header_background_light">#EFEFEF</color>
     <color name="compose_media_button_light">#000000</color>
     <color name="compose_media_button_disabled_light">#8F8F8F</color>
     <color name="compose_mention_light">#2F5F6F</color>
-    <color name="notification_content_faded_light">#7F7F7F</color>
-    <color name="notification_icon_tint_light">#1F1F1F</color>
     <color name="report_status_background_light">#EFEFEF</color>
     <color name="report_status_divider_light">#9F9F9F</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2d5dc4ab5..d6f58e08e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -10,6 +10,11 @@
         <item name="android:textColorTertiary">@color/text_color_tertiary_dark</item>
     </style>
 
+    <style name="Dialog.FullScreen" parent="Theme.AppCompat.Dialog">
+        <item name="android:padding">0dp</item>
+        <item name="android:windowBackground">@android:color/black</item>
+    </style>
+
     <!--Base Application Theme Styles (Dark)-->
 
     <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
@@ -38,8 +43,8 @@
         <item name="image_button_style">@style/AppTheme.ImageButton.Dark</item>
         <item name="status_reblog_inactive_drawable">@drawable/reblog_inactive_dark</item>
         <item name="status_reblog_disabled_drawable">@drawable/reblog_disabled_dark</item>
+        <item name="status_favourite_active_drawable">@drawable/favourite_active_dark</item>
         <item name="status_favourite_inactive_drawable">@drawable/favourite_inactive_dark</item>
-        <item name="status_favourite_button_marked_tint">@color/status_favourite_button_marked_dark</item>
         <item name="content_warning_button">@drawable/toggle_small</item>
         <item name="sensitive_media_warning_background_color">@color/color_background_dark</item>
         <item name="media_preview_unloaded_drawable">@drawable/media_preview_unloaded_dark</item>
@@ -50,13 +55,14 @@
         <item name="account_toolbar_icon_tint_uncollapsed">@color/toolbar_icon_dark</item>
         <item name="account_toolbar_icon_tint_collapsed">@color/account_toolbar_icon_collapsed_dark</item>
         <item name="account_toolbar_popup_theme">@style/AppTheme.Account.ToolbarPopupTheme.Dark</item>
+        <item name="compose_close_button_tint">@color/toolbar_icon_dark</item>
         <item name="compose_media_button_tint">@color/compose_media_button_dark</item>
         <item name="compose_media_button_disabled_tint">@color/compose_media_button_disabled_dark</item>
         <item name="compose_mention_color">@color/color_accent_dark</item>
         <item name="compose_content_warning_bar_background">@drawable/border_background_dark</item>
         <item name="compose_send_private_drawable">@drawable/send_private_dark</item>
-        <item name="notification_content">@color/notification_content_faded_dark</item>
-        <item name="notification_icon_tint">@color/notification_icon_tint_dark</item>
+        <item name="compose_nsfw_button_color">@color/image_button_dark</item>
+        <item name="compose_nsfw_button_selected_color">@color/color_accent_dark</item>
         <item name="report_status_background_color">@color/color_background_dark</item>
         <item name="report_status_divider_drawable">@drawable/status_divider_dark</item>
 
@@ -96,11 +102,6 @@
         <item name="windowActionBarOverlay">true</item>
     </style>
 
-    <style name="Dialog.FullScreen" parent="Theme.AppCompat.Dialog">
-        <item name="android:padding">0dp</item>
-        <item name="android:windowBackground">@android:color/black</item>
-    </style>
-
     <!--Light Application Theme Styles-->
 
     <style name="AppTheme.Light" parent="Theme.AppCompat.Light.NoActionBar">
@@ -129,25 +130,26 @@
         <item name="image_button_style">@style/AppTheme.ImageButton.Light</item>
         <item name="status_reblog_inactive_drawable">@drawable/reblog_inactive_light</item>
         <item name="status_reblog_disabled_drawable">@drawable/reblog_disabled_light</item>
+        <item name="status_favourite_active_drawable">@drawable/favourite_active_light</item>
         <item name="status_favourite_inactive_drawable">@drawable/favourite_inactive_light</item>
-        <item name="status_favourite_button_marked_tint">@color/status_favourite_button_marked_light</item>
         <item name="content_warning_button">@drawable/toggle_small_light</item>
         <item name="sensitive_media_warning_background_color">@color/sensitive_media_warning_background_light</item>
         <item name="media_preview_unloaded_drawable">@drawable/media_preview_unloaded_light</item>
         <item name="status_divider_drawable">@drawable/status_divider_light</item>
         <item name="tab_icon_selected_tint">@color/color_accent_light</item>
         <item name="tab_page_margin_drawable">@drawable/tab_page_margin_light</item>
+        <item name="account_header_background_color">@color/account_header_background_light</item>
         <item name="account_toolbar_icon_tint_uncollapsed">@color/toolbar_icon_dark</item> <!--Default to dark on purpose, because header backgrounds with gradients are always dark.-->
         <item name="account_toolbar_icon_tint_collapsed">@color/account_toolbar_icon_collapsed_light</item>
         <item name="account_toolbar_popup_theme">@style/AppTheme.Account.ToolbarPopupTheme.Light</item>
-        <item name="account_header_background_color">@color/account_header_background_light</item>
+        <item name="compose_close_button_tint">@color/toolbar_icon_light</item>
         <item name="compose_media_button_tint">@color/compose_media_button_light</item>
         <item name="compose_media_button_disabled_tint">@color/compose_media_button_disabled_light</item>
         <item name="compose_mention_color">@color/compose_mention_light</item>
         <item name="compose_content_warning_bar_background">@drawable/border_background_light</item>
         <item name="compose_send_private_drawable">@drawable/send_private_light</item>
-        <item name="notification_content">@color/notification_content_faded_light</item>
-        <item name="notification_icon_tint">@color/notification_icon_tint_light</item>
+        <item name="compose_nsfw_button_color">@color/image_button_light</item>
+        <item name="compose_nsfw_button_selected_color">@color/color_accent_light</item>
         <item name="report_status_background_color">@color/report_status_background_light</item>
         <item name="report_status_divider_drawable">@drawable/report_status_divider_light</item>