Merge upstream, update color scheme

app/build.gradle

@@ -108,7 +108,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
     implementation "androidx.core:core-ktx:1.2.0-rc01"
-    implementation "androidx.appcompat:appcompat:1.1.0"
+    implementation "androidx.appcompat:appcompat:1.2.0-alpha02"
     implementation "androidx.fragment:fragment-ktx:1.1.0"
     implementation "androidx.browser:browser:1.2.0"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"

app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt

@@ -19,13 +19,14 @@ import android.animation.ArgbEvaluator
 import android.content.Context
 import android.content.Intent
 import android.content.res.ColorStateList
-import android.graphics.*
+import android.graphics.Color
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffColorFilter
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
 import androidx.annotation.Px
 import androidx.appcompat.app.AlertDialog
@@ -241,9 +242,6 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
             setDisplayShowTitleEnabled(false)
         }
 
-        ThemeUtils.setDrawableTint(this, accountToolbar.navigationIcon, R.attr.account_toolbar_icon_tint_uncollapsed)
-        ThemeUtils.setDrawableTint(this, accountToolbar.overflowIcon, R.attr.account_toolbar_icon_tint_uncollapsed)
-
         val appBarElevation = resources.getDimension(R.dimen.actionbar_elevation)
 
         val toolbarBackground = MaterialShapeDrawable.createWithElevationOverlay(this, appBarElevation)
@@ -264,9 +262,6 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
         // Add a listener to change the toolbar icon color when it enters/exits its collapsed state.
         accountAppBarLayout.addOnOffsetChangedListener(object : AppBarLayout.OnOffsetChangedListener {
 
-            @AttrRes
-            var priorAttribute = R.attr.account_toolbar_icon_tint_uncollapsed
-
             override fun onOffsetChanged(appBarLayout: AppBarLayout, verticalOffset: Int) {
 
                 if (verticalOffset == oldOffset) {
@@ -274,20 +269,10 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
                 }
                 oldOffset = verticalOffset
 
-                @AttrRes val attribute = if (titleVisibleHeight + verticalOffset < 0) {
+                if (titleVisibleHeight + verticalOffset < 0) {
                     supportActionBar?.setDisplayShowTitleEnabled(true)
-
-                    R.attr.account_toolbar_icon_tint_collapsed
                 } else {
                     supportActionBar?.setDisplayShowTitleEnabled(false)
-
-                    R.attr.account_toolbar_icon_tint_uncollapsed
-                }
-                if (attribute != priorAttribute) {
-                    priorAttribute = attribute
-                    val context = accountToolbar.context
-                    ThemeUtils.setDrawableTint(context, accountToolbar.navigationIcon, attribute)
-                    ThemeUtils.setDrawableTint(context, accountToolbar.overflowIcon, attribute)
                 }
 
                 if (hideFab && !viewModel.isSelf && !blocking) {

app/src/main/java/com/keylesspalace/tusky/BaseActivity.java

@@ -76,7 +76,7 @@ public abstract class BaseActivity extends AppCompatActivity implements Injectab
         /* set the taskdescription programmatically, the theme would turn it blue */
         String appName = getString(R.string.app_name);
         Bitmap appIcon = BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher);
-        int recentsBackgroundColor = ThemeUtils.getColor(this, R.attr.recents_background_color);
+        int recentsBackgroundColor = ThemeUtils.getColor(this, R.attr.colorSurface);
 
         setTaskDescription(new ActivityManager.TaskDescription(appName, appIcon, recentsBackgroundColor));
 

app/src/main/java/com/keylesspalace/tusky/LoginActivity.kt

@@ -362,7 +362,7 @@ class LoginActivity : BaseActivity(), Injectable {
 
         private fun openInCustomTab(uri: Uri, context: Context): Boolean {
 
-            val toolbarColor = ThemeUtils.getColor(context, R.attr.custom_tab_toolbar)
+            val toolbarColor = ThemeUtils.getColor(context, R.attr.colorSurface)
             val customTabsIntentBuilder = CustomTabsIntent.Builder()
                     .setToolbarColor(toolbarColor)
 

app/src/main/java/com/keylesspalace/tusky/MainActivity.java

@@ -363,7 +363,7 @@ public final class MainActivity extends BottomSheetActivity implements ActionBut
 
         ImageView background = headerResult.getHeaderBackgroundView();
         background.setColorFilter(ContextCompat.getColor(this, R.color.header_background_filter));
-        background.setBackgroundColor(ContextCompat.getColor(this, R.color.window_background_dark));
+        background.setBackgroundColor(ContextCompat.getColor(this, R.color.tusky_grey_10));
 
         final boolean animateAvatars = PreferenceManager.getDefaultSharedPreferences(this)
                 .getBoolean("animateGifAvatars", false);

app/src/main/java/com/keylesspalace/tusky/TabData.kt

@@ -44,7 +44,7 @@ fun createTabDataFromId(id: String, arguments: List<String> = emptyList()): TabD
         NOTIFICATIONS -> TabData(NOTIFICATIONS, R.string.title_notifications, R.drawable.ic_notifications_24dp, { NotificationsFragment.newInstance() })
         LOCAL -> TabData(LOCAL, R.string.title_public_local, R.drawable.ic_local_24dp, { TimelineFragment.newInstance(TimelineFragment.Kind.PUBLIC_LOCAL) })
         FEDERATED -> TabData(FEDERATED, R.string.title_public_federated, R.drawable.ic_public_24dp, { TimelineFragment.newInstance(TimelineFragment.Kind.PUBLIC_FEDERATED) })
-        DIRECT -> TabData(DIRECT, R.string.title_direct_messages, R.drawable.reblog_direct_dark, { ConversationsFragment.newInstance() })
+        DIRECT -> TabData(DIRECT, R.string.title_direct_messages, R.drawable.ic_reblog_direct_24dp, { ConversationsFragment.newInstance() })
         HASHTAG -> TabData(HASHTAG, R.string.hashtag, R.drawable.ic_hashtag, { args -> TimelineFragment.newInstance(TimelineFragment.Kind.TAG, args.getOrNull(0).orEmpty()) }, arguments)
         LIST -> TabData(LIST, R.string.list, R.drawable.ic_list, { args -> TimelineFragment.newInstance(TimelineFragment.Kind.LIST, args.getOrNull(0).orEmpty()) }, arguments)
         else -> throw IllegalArgumentException("unknown tab type")

app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt

@@ -41,7 +41,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import kotlinx.android.synthetic.main.activity_tab_preference.*
 import kotlinx.android.synthetic.main.toolbar_basic.*
-import kotlinx.android.synthetic.main.item_tab_preference.view.removeButton
 import java.util.regex.Pattern
 import javax.inject.Inject
 

app/src/main/java/com/keylesspalace/tusky/adapter/ListSelectionAdapter.kt

@@ -27,19 +27,16 @@ import kotlinx.android.synthetic.main.item_picker_list.view.*
 
 class ListSelectionAdapter(context: Context) : ArrayAdapter<MastoList>(context, R.layout.item_autocomplete_hashtag) {
     override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
-        var view = convertView
 
-        if (convertView == null) {
-            val layoutInflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
-            view = layoutInflater.inflate(R.layout.item_picker_list, parent, false)
-        }
-        view!!
+        val layoutInflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
+
+        val view = convertView
+                ?: layoutInflater.inflate(R.layout.item_picker_list, parent, false)
 
-        val list = getItem(position)
-        if (list != null) {
+        getItem(position)?.let { list ->
             val title = view.title
             title.text = list.title
-            val icon = ThemeUtils.getTintedDrawable(context, R.drawable.ic_list, android.R.attr.textColorTertiary)
+            val icon = ThemeUtils.getTintedDrawable(context, R.drawable.ic_list, R.attr.iconColor)
             title.setCompoundDrawablesRelativeWithIntrinsicBounds(icon, null, null, null)
         }
 

app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java

@@ -153,10 +153,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
         this.avatarRadius36dp = itemView.getContext().getResources().getDimensionPixelSize(R.dimen.avatar_radius_36dp);
         this.avatarRadius24dp = itemView.getContext().getResources().getDimensionPixelSize(R.dimen.avatar_radius_24dp);
 
-        mediaPreviewUnloaded = itemView.getContext().getDrawable(
-                ThemeUtils.getDrawableId(itemView.getContext(),
-                        R.attr.media_preview_unloaded_drawable, android.R.color.black)
-        );
+        mediaPreviewUnloaded = new ColorDrawable(ThemeUtils.getColor(itemView.getContext(), R.attr.colorBackgroundAccent));
     }
 
     protected abstract int getMediaPreviewHeight(Context context);
@@ -353,12 +350,10 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
             int inactiveId;
             int activeId;
             if (visibility == Status.Visibility.PRIVATE) {
-                inactiveId = ThemeUtils.getDrawableId(reblogButton.getContext(),
-                        R.attr.status_reblog_disabled_drawable, R.drawable.reblog_private_dark);
-                activeId = R.drawable.reblog_private_active;
+                inactiveId = R.drawable.ic_reblog_private_24dp;
+                activeId = R.drawable.ic_reblog_private_active_24dp;
             } else {
-                inactiveId = ThemeUtils.getDrawableId(reblogButton.getContext(),
-                        R.attr.status_reblog_inactive_drawable, R.drawable.reblog_inactive_dark);
+                inactiveId = R.drawable.ic_reblog_24dp;
                 activeId = R.drawable.ic_reblog_active_24dp;
             }
             reblogButton.setInactiveImage(inactiveId);
@@ -366,11 +361,9 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
         } else {
             int disabledId;
             if (visibility == Status.Visibility.DIRECT) {
-                disabledId = ThemeUtils.getDrawableId(reblogButton.getContext(),
-                        R.attr.status_reblog_direct_drawable, R.drawable.reblog_direct_dark);
+                disabledId = R.drawable.ic_reblog_direct_24dp;
             } else {
-                disabledId = ThemeUtils.getDrawableId(reblogButton.getContext(),
-                        R.attr.status_reblog_disabled_drawable, R.drawable.reblog_private_dark);
+                disabledId = R.drawable.ic_reblog_private_24dp;
             }
             reblogButton.setInactiveImage(disabledId);
             reblogButton.setActiveImage(disabledId);
@@ -468,8 +461,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
                     BitmapDrawable blurhashBitmap = decodeBlurHash(attachment.getBlurhash());
                     imageView.setImageDrawable(blurhashBitmap);
                 } else {
-                    imageView.setImageDrawable(new ColorDrawable(ThemeUtils.getColor(
-                            context, R.attr.sensitive_media_warning_background_color)));
+                    imageView.setImageDrawable(mediaPreviewUnloaded);
                 }
             }
 

app/src/main/java/com/keylesspalace/tusky/adapter/TabAdapter.kt

@@ -88,7 +88,7 @@ class TabAdapter(private var data: List<TabData>,
             ThemeUtils.setDrawableTint(
                 holder.itemView.context,
                 holder.itemView.removeButton.drawable,
-                (if (removeButtonEnabled) android.R.attr.textColorTertiary else R.attr.image_button_disabled_tint)
+                (if (removeButtonEnabled) android.R.attr.textColorTertiary else R.attr.textColorDisabled)
             )
         }
 

app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt

@@ -43,7 +43,6 @@ import androidx.annotation.ColorInt
 import androidx.annotation.StringRes
 import androidx.annotation.VisibleForTesting
 import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
@@ -116,6 +115,8 @@ class ComposeActivity : BaseActivity(),
     private var composeOptions: ComposeOptions? = null
     private lateinit var viewModel: ComposeViewModel
 
+    private var mediaCount = 0
+
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val preferences = PreferenceManager.getDefaultSharedPreferences(this)
@@ -350,9 +351,12 @@ class ComposeActivity : BaseActivity(),
                 setStatusVisibility(visibility)
             }
             viewModel.media.observe { media ->
-                composeMediaPreviewBar.visible(media.isNotEmpty())
                 mediaAdapter.submitList(media)
-                updateSensitiveMediaToggle(viewModel.markMediaAsSensitive.value != false, viewModel.showContentWarning.value != false)
+                if(media.size != mediaCount) {
+                    mediaCount = media.size
+                    composeMediaPreviewBar.visible(media.isNotEmpty())
+                    updateSensitiveMediaToggle(viewModel.markMediaAsSensitive.value != false, viewModel.showContentWarning.value != false)
+                }
             }
             viewModel.poll.observe { poll ->
                 pollPreview.visible(poll != null)
@@ -435,9 +439,7 @@ class ComposeActivity : BaseActivity(),
             title = null
             setDisplayHomeAsUpEnabled(true)
             setDisplayShowHomeEnabled(true)
-            val closeIcon = AppCompatResources.getDrawable(this@ComposeActivity, R.drawable.ic_close_24dp)
-            ThemeUtils.setDrawableTint(this@ComposeActivity, closeIcon!!, R.attr.compose_close_button_tint)
-            setHomeAsUpIndicator(closeIcon)
+            setHomeAsUpIndicator(R.drawable.ic_close_24dp)
         }
 
     }
@@ -591,8 +593,6 @@ class ComposeActivity : BaseActivity(),
     }
 
     private fun updateSensitiveMediaToggle(markMediaSensitive: Boolean, contentWarningShown: Boolean) {
-        TransitionManager.beginDelayedTransition(composeHideMediaButton.parent as ViewGroup)
-
         if (viewModel.media.value.isNullOrEmpty()) {
             composeHideMediaButton.hide()
         } else {
@@ -600,7 +600,7 @@ class ComposeActivity : BaseActivity(),
             @ColorInt val color = if (contentWarningShown) {
                 composeHideMediaButton.setImageResource(R.drawable.ic_hide_media_24dp)
                 composeHideMediaButton.isClickable = false
-                ContextCompat.getColor(this, R.color.compose_media_visible_button_disabled_blue)
+                ContextCompat.getColor(this, R.color.transparent_tusky_blue)
 
             } else {
                 composeHideMediaButton.isClickable = true
@@ -924,14 +924,14 @@ class ComposeActivity : BaseActivity(),
         button.isEnabled = clickable
         ThemeUtils.setDrawableTint(this, button.drawable,
                 if (colorActive) android.R.attr.textColorTertiary
-                else R.attr.image_button_disabled_tint)
+                else R.attr.textColorDisabled)
     }
 
     private fun enablePollButton(enable: Boolean) {
         addPollTextActionTextView.isEnabled = enable
         val textColor = ThemeUtils.getColor(this,
                 if (enable) android.R.attr.textColorTertiary
-                else R.attr.image_button_disabled_tint)
+                else R.attr.textColorDisabled)
         addPollTextActionTextView.setTextColor(textColor)
         addPollTextActionTextView.compoundDrawablesRelative[0].colorFilter = PorterDuffColorFilter(textColor, PorterDuff.Mode.SRC_IN)
     }

app/src/main/java/com/keylesspalace/tusky/components/compose/view/ProgressImageView.java

@@ -66,7 +66,7 @@ public final class ProgressImageView extends AppCompatImageView {
 
         markBgPaint.setStyle(Paint.Style.FILL);
         markBgPaint.setColor(ContextCompat.getColor(getContext(),
-                R.color.description_marker_unselected));
+                R.color.tusky_grey_10));
         captionDrawable = AppCompatResources.getDrawable(getContext(), R.drawable.spellcheck);
     }
 
@@ -82,7 +82,7 @@ public final class ProgressImageView extends AppCompatImageView {
 
     public void setChecked(boolean checked) {
         this.markBgPaint.setColor(ContextCompat.getColor(getContext(),
-                checked ? R.color.tusky_blue : R.color.description_marker_unselected));
+                checked ? R.color.tusky_blue : R.color.tusky_grey_10));
         invalidate();
     }
 

app/src/main/java/com/keylesspalace/tusky/components/compose/view/ProgressTextView.java

@@ -67,7 +67,7 @@ public final class ProgressTextView extends TextView {
 
         markBgPaint.setStyle(Paint.Style.FILL);
         markBgPaint.setColor(ContextCompat.getColor(getContext(),
-                R.color.description_marker_unselected));
+                R.color.tusky_grey_10));
         captionDrawable = AppCompatResources.getDrawable(getContext(), R.drawable.spellcheck);
     }
 
@@ -78,7 +78,7 @@ public final class ProgressTextView extends TextView {
 
     public void setChecked(boolean checked) {
         this.markBgPaint.setColor(ContextCompat.getColor(getContext(),
-                checked ? R.color.tusky_blue : R.color.description_marker_unselected));
+                checked ? R.color.tusky_blue : R.color.tusky_grey_10));
         invalidate();
     }
 

app/src/main/java/com/keylesspalace/tusky/components/report/ReportActivity.kt

@@ -60,14 +60,11 @@ class ReportActivity : BottomSheetActivity(), HasAndroidInjector {
 
         setSupportActionBar(toolbar)
 
-        val closeIcon = AppCompatResources.getDrawable(this, R.drawable.ic_close_24dp)
-        ThemeUtils.setDrawableTint(this, closeIcon!!, R.attr.compose_close_button_tint)
-
         supportActionBar?.apply {
             title = getString(R.string.report_username_format, viewModel.accountUserName)
             setDisplayHomeAsUpEnabled(true)
             setDisplayShowHomeEnabled(true)
-            setHomeAsUpIndicator(closeIcon)
+            setHomeAsUpIndicator(R.drawable.ic_close_24dp)
         }
 
         initViewPager()

app/src/main/java/com/keylesspalace/tusky/fragment/AccountMediaFragment.kt

@@ -23,7 +23,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.core.app.ActivityOptionsCompat
-import androidx.core.content.ContextCompat
 import androidx.core.view.ViewCompat
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -179,15 +178,11 @@ class AccountMediaFragment : BaseFragment(), RefreshableFragment, Injectable {
         val columnCount = view.context.resources.getInteger(R.integer.profile_media_column_count)
         val layoutManager = GridLayoutManager(view.context, columnCount)
 
-        val bgRes = ThemeUtils.getColorId(view.context, R.attr.window_background)
-
-        adapter.baseItemColor = ContextCompat.getColor(recyclerView.context, bgRes)
+        adapter.baseItemColor =  ThemeUtils.getColor(view.context, android.R.attr.windowBackground)
 
         recyclerView.layoutManager = layoutManager
         recyclerView.adapter = adapter
 
-
-
         if (isSwipeToRefreshEnabled) {
             swipeRefreshLayout.setOnRefreshListener {
                 refresh()

app/src/main/java/com/keylesspalace/tusky/fragment/preference/AccountPreferencesFragment.kt

@@ -92,9 +92,9 @@ class AccountPreferencesFragment : PreferenceFragmentCompat(),
         publicFiltersPreference = requirePreference("publicFilters")
         threadFiltersPreference = requirePreference("threadFilters")
 
-        notificationPreference.icon = IconicsDrawable(notificationPreference.context, GoogleMaterial.Icon.gmd_notifications).sizePx(iconSize).color(ThemeUtils.getColor(notificationPreference.context, R.attr.preference_icon_tint))
+        notificationPreference.icon = IconicsDrawable(notificationPreference.context, GoogleMaterial.Icon.gmd_notifications).sizePx(iconSize).color(ThemeUtils.getColor(notificationPreference.context, R.attr.iconColor))
         mutedUsersPreference.icon = getTintedIcon(R.drawable.ic_mute_24dp)
-        blockedUsersPreference.icon = IconicsDrawable(blockedUsersPreference.context, GoogleMaterial.Icon.gmd_block).sizePx(iconSize).color(ThemeUtils.getColor(blockedUsersPreference.context, R.attr.preference_icon_tint))
+        blockedUsersPreference.icon = IconicsDrawable(blockedUsersPreference.context, GoogleMaterial.Icon.gmd_block).sizePx(iconSize).color(ThemeUtils.getColor(blockedUsersPreference.context, R.attr.iconColor))
         mutedDomainsPreference.icon = getTintedIcon(R.drawable.ic_mute_24dp)
 
         notificationPreference.onPreferenceClickListener = this
@@ -288,9 +288,7 @@ class AccountPreferencesFragment : PreferenceFragmentCompat(),
     }
 
     private fun getTintedIcon(iconId: Int): Drawable? {
-        val drawable = context?.getDrawable(iconId)
-        ThemeUtils.setDrawableTint(context, drawable, R.attr.preference_icon_tint)
-        return drawable
+        return ThemeUtils.getTintedDrawable(requireContext(), iconId, R.attr.iconColor)
     }
 
     private fun launchFilterActivity(filterContext: String, titleResource: Int): Boolean {
@@ -303,9 +301,7 @@ class AccountPreferencesFragment : PreferenceFragmentCompat(),
     }
 
     companion object {
-        fun newInstance(): AccountPreferencesFragment {
-            return AccountPreferencesFragment()
-        }
+        fun newInstance() = AccountPreferencesFragment()
     }
 
 }

app/src/main/java/com/keylesspalace/tusky/fragment/preference/PreferencesFragment.kt

@@ -38,13 +38,13 @@ class PreferencesFragment : PreferenceFragmentCompat() {
         addPreferencesFromResource(R.xml.preferences)
 
         val themePreference: Preference = requirePreference("appTheme")
-        themePreference.icon = IconicsDrawable(themePreference.context, GoogleMaterial.Icon.gmd_palette).sizePx(iconSize).color(ThemeUtils.getColor(themePreference.context, R.attr.preference_icon_tint))
+        themePreference.icon = IconicsDrawable(themePreference.context, GoogleMaterial.Icon.gmd_palette).sizePx(iconSize).color(ThemeUtils.getColor(themePreference.context, R.attr.iconColor))
 
         val emojiPreference: Preference = requirePreference("emojiCompat")
-        emojiPreference.icon = IconicsDrawable(emojiPreference.context, GoogleMaterial.Icon.gmd_sentiment_satisfied).sizePx(iconSize).color(ThemeUtils.getColor(emojiPreference.context, R.attr.preference_icon_tint))
+        emojiPreference.icon = IconicsDrawable(emojiPreference.context, GoogleMaterial.Icon.gmd_sentiment_satisfied).sizePx(iconSize).color(ThemeUtils.getColor(emojiPreference.context, R.attr.iconColor))
 
         val textSizePreference: Preference = requirePreference("statusTextSize")
-        textSizePreference.icon = IconicsDrawable(textSizePreference.context, GoogleMaterial.Icon.gmd_format_size).sizePx(iconSize).color(ThemeUtils.getColor(textSizePreference.context, R.attr.preference_icon_tint))
+        textSizePreference.icon = IconicsDrawable(textSizePreference.context, GoogleMaterial.Icon.gmd_format_size).sizePx(iconSize).color(ThemeUtils.getColor(textSizePreference.context, R.attr.iconColor))
 
         val timelineFilterPreferences: Preference = requirePreference("timelineFilterPreferences")
         timelineFilterPreferences.setOnPreferenceClickListener {
@@ -67,12 +67,11 @@ class PreferencesFragment : PreferenceFragmentCompat() {
         }
 
         val languagePreference: Preference = requirePreference("language")
-        languagePreference.icon = IconicsDrawable(languagePreference.context, GoogleMaterial.Icon.gmd_translate).sizePx(iconSize).color(ThemeUtils.getColor(languagePreference.context, R.attr.preference_icon_tint))
+        languagePreference.icon = IconicsDrawable(languagePreference.context, GoogleMaterial.Icon.gmd_translate).sizePx(iconSize).color(ThemeUtils.getColor(languagePreference.context, R.attr.iconColor))
 
         val botIndicatorPreference = requirePreference("showBotOverlay")
-        val botDrawable = botIndicatorPreference.context.getDrawable(R.drawable.ic_bot_24dp)
-        ThemeUtils.setDrawableTint(context, botDrawable, R.attr.preference_icon_tint)
-        botIndicatorPreference.icon = botDrawable
+
+        botIndicatorPreference.icon = ThemeUtils.getTintedDrawable(requireContext(), R.drawable.ic_bot_24dp, R.attr.iconColor)
     }
 
     override fun onResume() {

app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.java

@@ -228,7 +228,7 @@ public class LinkHelper {
      * @param context context
      */
     public static void openLinkInCustomTab(Uri uri, Context context) {
-        int toolbarColor = ThemeUtils.getColor(context, R.attr.custom_tab_toolbar);
+        int toolbarColor = ThemeUtils.getColor(context, R.attr.colorSurface);
 
         CustomTabsIntent.Builder customTabsIntentBuilder = new CustomTabsIntent.Builder()
                 .setToolbarColor(toolbarColor)

app/src/main/java/com/keylesspalace/tusky/util/StatusViewHelper.kt

@@ -24,6 +24,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.annotation.DrawableRes
 import androidx.appcompat.content.res.AppCompatResources
+import androidx.core.content.ContextCompat
 import com.bumptech.glide.Glide
 import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.entity.Attachment
@@ -87,8 +88,7 @@ class StatusViewHelper(private val itemView: View) {
         }
 
 
-        val mediaPreviewUnloaded = ThemeUtils.getDrawable(context,
-                R.attr.media_preview_unloaded_drawable, android.R.color.black)
+        val mediaPreviewUnloaded = ColorDrawable(ThemeUtils.getColor(context, R.attr.colorBackgroundAccent))
 
         val n = min(attachments.size, Status.MAX_MEDIA_ATTACHMENTS)
 
@@ -141,8 +141,7 @@ class StatusViewHelper(private val itemView: View) {
                         val blurhashBitmap = decodeBlurHash(context, attachment.blurhash)
                         mediaPreviews[i].setImageDrawable(blurhashBitmap)
                     } else {
-                        mediaPreviews[i].setImageDrawable(ColorDrawable(ThemeUtils.getColor(
-                                context, R.attr.sensitive_media_warning_background_color)))
+                        mediaPreviews[i].setImageDrawable(mediaPreviewUnloaded)
                     }
                 }
             }

app/src/main/java/com/keylesspalace/tusky/util/ThemeUtils.java

@@ -21,7 +21,6 @@ import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import androidx.annotation.AttrRes;
 import androidx.annotation.ColorInt;
-import androidx.annotation.ColorRes;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -42,29 +41,6 @@ public class ThemeUtils {
     private static final String THEME_AUTO = "auto";
     private static final String THEME_SYSTEM = "auto_system";
 
-    public static Drawable getDrawable(@NonNull Context context, @AttrRes int attribute,
-            @DrawableRes int fallbackDrawable) {
-        TypedValue value = new TypedValue();
-        @DrawableRes int resourceId;
-        if (context.getTheme().resolveAttribute(attribute, value, true)) {
-            resourceId = value.resourceId;
-        } else {
-            resourceId = fallbackDrawable;
-        }
-        return context.getDrawable(resourceId);
-    }
-
-    @DrawableRes
-    public static int getDrawableId(@NonNull Context context, @AttrRes int attribute,
-                                    @DrawableRes int fallbackDrawableId) {
-        TypedValue value = new TypedValue();
-        if (context.getTheme().resolveAttribute(attribute, value, true)) {
-            return value.resourceId;
-        } else {
-            return fallbackDrawableId;
-        }
-    }
-
     @ColorInt
     public static int getColor(@NonNull Context context, @AttrRes int attribute) {
         TypedValue value = new TypedValue();
@@ -75,13 +51,6 @@ public class ThemeUtils {
         }
     }
 
-    @ColorRes
-    public static int getColorId(@NonNull Context context, @AttrRes int attribute) {
-        TypedValue value = new TypedValue();
-        context.getTheme().resolveAttribute(attribute, value, true);
-        return value.resourceId;
-    }
-
     /** this can be replaced with drawableTint in xml once minSdkVersion >= 23 */
     @Nullable
     public static Drawable getTintedDrawable(@NonNull Context context, @DrawableRes int drawableId, @AttrRes int colorAttr) {

app/src/main/java/com/keylesspalace/tusky/view/ConversationLineItemDecoration.kt

@@ -20,15 +20,14 @@ import android.graphics.Canvas
 import android.graphics.drawable.Drawable
 import androidx.recyclerview.widget.RecyclerView
 import android.view.View
+import androidx.core.content.ContextCompat
 
 import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.adapter.ThreadAdapter
-import com.keylesspalace.tusky.util.ThemeUtils
 
 class ConversationLineItemDecoration(private val context: Context) : RecyclerView.ItemDecoration() {
 
-    private val divider: Drawable  = ThemeUtils.getDrawable(context, R.attr.conversation_thread_line_drawable,
-            R.drawable.conversation_thread_line_dark)
+    private val divider: Drawable = ContextCompat.getDrawable(context, R.drawable.conversation_thread_line)!!
 
     override fun onDraw(canvas: Canvas, parent: RecyclerView, state: RecyclerView.State) {
         val dividerStart = parent.paddingStart + context.resources.getDimensionPixelSize(R.dimen.status_line_margin_start)

app/src/main/java/com/keylesspalace/tusky/view/LicenseCard.kt

@@ -34,7 +34,7 @@ class LicenseCard
     init {
         inflate(context, R.layout.card_license, this)
 
-        setCardBackgroundColor(ThemeUtils.getColor(context, android.R.attr.colorBackground))
+        setCardBackgroundColor(ThemeUtils.getColor(context, R.attr.colorSurface))
 
         val a = context.theme.obtainStyledAttributes(attrs, R.styleable.LicenseCard, 0, 0)
 

app/src/main/res/color/color_background_transparent_60.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="0.6" android:color="@color/colorBackground" />
+</selector>

app/src/main/res/color/compound_button_color.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="false" android:color="@color/text_color_tertiary_dark"/>
+    <!-- attr not working here for Android 5? -->
+    <item android:state_checked="false" android:color="@color/textColorTertiary"/>
     <item android:state_checked="true" android:color="@color/tusky_blue"/>
 </selector>

app/src/main/res/color/compound_button_color_light.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="false" android:color="@color/text_color_tertiary_light"/>
-    <item android:state_checked="true" android:color="@color/tusky_blue"/>
-</selector>

app/src/main/res/drawable-night/background_dialog_activity.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="8dp" />
-    <solid android:color="@color/window_background_dark" />
-</shape>

app/src/main/res/drawable-night/ic_emoji_34dp.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="34dp"
-    android:height="34dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="@color/text_color_secondary_dark"
-        android:pathData="M12,17.5C14.33,17.5 16.3,16.04 17.11,14H6.89C7.69,16.04 9.67,17.5 12,17.5M8.5,11A1.5,1.5 0 0,0 10,9.5A1.5,1.5 0 0,0 8.5,8A1.5,1.5 0 0,0 7,9.5A1.5,1.5 0 0,0 8.5,11M15.5,11A1.5,1.5 0 0,0 17,9.5A1.5,1.5 0 0,0 15.5,8A1.5,1.5 0 0,0 14,9.5A1.5,1.5 0 0,0 15.5,11M12,20A8,8 0 0,1 4,12A8,8 0 0,1 12,4A8,8 0 0,1 20,12A8,8 0 0,1 12,20M12,2C6.47,2 2,6.5 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
-</vector>

app/src/main/res/drawable-night/profile_badge_background.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <stroke android:width="1dp" android:color="@color/text_color_tertiary_dark"/>
-    <corners android:radius="12dp"/>
-    <padding android:bottom="2dp" android:top="2dp" android:left="8dp" android:right="8dp"/>
-</shape>

app/src/main/res/drawable/autocomplete_divider_dark.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size android:height="1dp" />
-    <solid android:color="@color/autocomplete_divider_dark" />
-</shape>

app/src/main/res/drawable/avatar_border.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?attr/window_background" />
+    <solid android:color="?android:attr/windowBackground" />
     <corners android:radius="7dp"/>
     <size android:height="52dp" android:width="52dp"/>
 </shape>

app/src/main/res/drawable/background_dialog_activity.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="8dp" />
-    <solid android:color="@color/window_background_light" />
+    <solid android:color="?android:attr/colorBackground" />
 </shape>

app/src/main/res/drawable/background_dialog_activity_black.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="5dp" />
-    <solid android:color="@color/dialog_background_black" />
-</shape>

app/src/main/res/drawable/background_splash.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
-        <color android:color="@color/color_primary_dark_dark"/>
+        <color android:color="@color/tusky_grey_20"/>
     </item>
     <item>
         <bitmap

app/src/main/res/drawable/border_background_dark.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="3dp" />
-    <stroke android:color="#ffffffff" android:width="1dp" />
-</shape>

app/src/main/res/drawable/border_background_light.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="3dp" />
-    <stroke android:color="#ff000000" android:width="1dp" />
-</shape>

app/src/main/res/drawable/card_frame.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="6dp" />
-    <stroke android:color="?attr/card_background_color" android:width="1dp" />
+    <stroke android:color="?attr/colorBackgroundAccent" android:width="1dp" />
 </shape>

app/src/main/res/drawable/conversation_thread_line.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <size android:width="4dp" />
-    <solid android:color="@color/status_divider_dark" />
+    <solid android:color="?attr/colorBackgroundAccent" />
 </shape>

app/src/main/res/drawable/conversation_thread_line_light.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size android:width="4dp" />
-    <solid android:color="@color/status_divider_light" />
-</shape>

app/src/main/res/drawable/favourite_active_dark.xml

@@ -1,9 +0,0 @@
-<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/tusky_orange"
-        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>

app/src/main/res/drawable/favourite_inactive_dark.xml

@@ -1,9 +0,0 @@
-<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/text_color_tertiary_dark"
-    android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
-</vector>

app/src/main/res/drawable/favourite_inactive_light.xml

@@ -1,10 +0,0 @@
-<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/text_color_tertiary_light"
-    android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
-</vector>
-

app/src/main/res/drawable/ic_attach_file_24dp.xml

@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/toolbar_icon_dark"
+        android:fillColor="#fff"
         android:pathData="M16.5,6v11.5c0,2.21 -1.79,4 -4,4s-4,-1.79 -4,-4V5c0,-1.38 1.12,-2.5 2.5,-2.5s2.5,1.12 2.5,2.5v10.5c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1V6H10v9.5c0,1.38 1.12,2.5 2.5,2.5s2.5,-1.12 2.5,-2.5V5c0,-2.21 -1.79,-4 -4,-4S7,2.79 7,5v12.5c0,3.04 2.46,5.5 5.5,5.5s5.5,-2.46 5.5,-5.5V6h-1.5z"/>
 </vector>

app/src/main/res/drawable/ic_clear_24dp.xml

@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/toolbar_icon_dark"
+        android:fillColor="#fff"
         android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
 </vector>

app/src/main/res/drawable/ic_close_24dp.xml

@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/toolbar_icon_dark"
+        android:fillColor="?android:attr/textColorSecondary"
         android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
 </vector>

app/src/main/res/drawable/ic_emoji_34dp.xml

@@ -4,6 +4,6 @@
     android:viewportHeight="24"
     android:viewportWidth="24">
     <path
-        android:fillColor="@color/text_color_secondary_light"
+        android:fillColor="?android:attr/textColorSecondary"
         android:pathData="M12,17.5C14.33,17.5 16.3,16.04 17.11,14H6.89C7.69,16.04 9.67,17.5 12,17.5M8.5,11A1.5,1.5 0 0,0 10,9.5A1.5,1.5 0 0,0 8.5,8A1.5,1.5 0 0,0 7,9.5A1.5,1.5 0 0,0 8.5,11M15.5,11A1.5,1.5 0 0,0 17,9.5A1.5,1.5 0 0,0 15.5,8A1.5,1.5 0 0,0 14,9.5A1.5,1.5 0 0,0 15.5,11M12,20A8,8 0 0,1 4,12A8,8 0 0,1 12,4A8,8 0 0,1 20,12A8,8 0 0,1 12,20M12,2C6.47,2 2,6.5 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
 </vector>

app/src/main/res/drawable/ic_favourite_24dp.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="?android:attr/textColorTertiary"
+        android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z" />
+</vector>

app/src/main/res/drawable/ic_favourite_active_24dp.xml

@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/tusky_orange_light"
+        android:fillColor="@color/favoriteButtonActiveColor"
         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>

app/src/main/res/drawable/ic_home_24dp.xml

@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/toolbar_icon_dark"
+        android:fillColor="#fff"
         android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
 </vector>

app/src/main/res/drawable/ic_lock_open_24dp.xml

@@ -4,6 +4,6 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path
-        android:fillColor="@color/toolbar_icon_dark"
+        android:fillColor="#fff"
         android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6h1.9c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM18,20L6,20L6,10h12v10z" />
 </vector>

app/src/main/res/drawable/ic_lock_outline_24dp.xml

@@ -4,6 +4,6 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path
-        android:fillColor="@color/toolbar_icon_dark"
+        android:fillColor="#fff"
         android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1s3.1,1.39 3.1,3.1v2L8.9,8L8.9,6zM18,20L6,20L6,10h12v10z" />
 </vector>

app/src/main/res/drawable/ic_more_horiz_24dp.xml

@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/toolbar_icon_dark"
+        android:fillColor="#fff"
         android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
 </vector>

app/src/main/res/drawable/ic_notifications_24dp.xml

@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/toolbar_icon_dark"
+        android:fillColor="#fff"
         android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
 </vector>

app/src/main/res/drawable/ic_play_indicator.xml

@@ -1,8 +1,8 @@
 <vector android:height="48dp" android:viewportHeight="24.0"
     android:viewportWidth="24.0" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#1a1c23"
+    <path android:fillAlpha=".85" android:fillColor="?attr/colorSurface"
         android:pathData="M21.282,12A9.282,9.282 0,0 1,12 21.282,9.282 9.282,0 0,1 2.718,12 9.282,9.282 0,0 1,12 2.718,9.282 9.282,0 0,1 21.282,12Z"
         android:strokeAlpha="1" android:strokeColor="#00000000"
         android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="8"/>
-    <path android:fillAlpha="1" android:fillColor="#2b90d9" android:pathData="M10,16.5l6,-4.5 -6,-4.5v9zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
+    <path android:fillAlpha="1" android:fillColor="@color/tusky_blue" android:pathData="M10,16.5l6,-4.5 -6,-4.5v9zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
 </vector>

app/src/main/res/drawable/ic_play_indicator_light.xml

@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-android:width="48dp"
-android:height="48dp"
-android:autoMirrored="true"
-android:viewportHeight="24.0"
-android:viewportWidth="24.0">
-<path
-    android:fillAlpha="1"
-    android:fillColor="#ffff"
-    android:pathData="M21.282,12A9.282,9.282 0,0 1,12 21.282,9.282 9.282,0 0,1 2.718,12 9.282,9.282 0,0 1,12 2.718,9.282 9.282,0 0,1 21.282,12Z" />
-<path
-    android:fillAlpha="1"
-    android:fillColor="#2b90d9"
-    android:pathData="M10,16.5l6,-4.5 -6,-4.5v9zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z" />
-</vector>

app/src/main/res/drawable/ic_public_24dp.xml

@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/toolbar_icon_dark"
+        android:fillColor="#fff"
         android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11,19.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L9,15v1c0,1.1 0.9,2 2,2v1.93zM17.9,17.39c-0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L8,12v-2h2c0.55,0 1,-0.45 1,-1L11,7h2c1.1,0 2,-0.9 2,-2v-0.41c2.93,1.19 5,4.06 5,7.41 0,2.08 -0.8,3.97 -2.1,5.39z"/>
 </vector>

app/src/main/res/drawable/ic_reblog_18dp.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="18dp"
+    android:height="18dp"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/text_color_tertiary_light"
-        android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
+        android:fillColor="?android:attr/textColorTertiary"
+        android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z" />
 </vector>

app/src/main/res/drawable/ic_reblog_24dp.xml

@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/text_color_tertiary_dark"
+        android:fillColor="?android:attr/textColorTertiary"
         android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
 </vector>

app/src/main/res/drawable/ic_reblog_dark_24dp.xml

@@ -1,4 +0,0 @@
-<vector android:height="18dp" android:viewportHeight="24.0"
-    android:viewportWidth="24.0" android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#9baec8" android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
-</vector>

app/src/main/res/drawable/ic_reblog_direct_24dp.xml

@@ -5,6 +5,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/status_reblog_button_disabled_dark"
+        android:fillColor="@color/textColorDisabled"
         android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z" />
 </vector>

app/src/main/res/drawable/ic_reblog_light_24dp.xml

@@ -1,4 +0,0 @@
-<vector android:height="18dp" android:viewportHeight="24.0"
-    android:viewportWidth="24.0" android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#5f636f" android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
-</vector>

app/src/main/res/drawable/ic_reblog_private_24dp.xml

@@ -4,6 +4,6 @@ android:height="24dp"
 android:viewportWidth="24.0"
 android:viewportHeight="24.0">
 <path
-    android:fillColor="@color/status_reblog_button_disabled_dark"
+    android:fillColor="@color/textColorDisabled"
     android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
 </vector>

app/src/main/res/drawable/ic_repeat_24dp.xml

@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/toolbar_icon_dark"
+        android:fillColor="#fff"
         android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
 </vector>

app/src/main/res/drawable/ic_reply_24dp.xml

@@ -5,6 +5,6 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path
-        android:fillColor="@color/toolbar_icon_dark"
+        android:fillColor="#fff"
         android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z" />
 </vector>

app/src/main/res/drawable/ic_reply_all_24dp.xml

@@ -5,6 +5,6 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path
-        android:fillColor="@color/toolbar_icon_dark"
+        android:fillColor="#fff"
         android:pathData="M7,8L7,5l-7,7 7,7v-3l-4,-4 4,-4zM13,9L13,5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z" />
 </vector>

app/src/main/res/drawable/ic_send_24dp.xml

@@ -5,6 +5,6 @@
         android:viewportHeight="24.0"
         android:autoMirrored="true">
     <path
-        android:fillColor="@color/toolbar_icon_dark"
+        android:fillColor="#fff"
         android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
 </vector>

app/src/main/res/drawable/ic_star_24dp.xml

@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/toolbar_icon_dark"
+        android:fillColor="#fff"
         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>

app/src/main/res/drawable/media_preview_unloaded_dark.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/color_background_dark" />
-
-    <stroke
-        android:dashWidth="4dp"
-        android:dashGap="4dp"
-        android:width="2dp"
-        android:color="@color/color_primary_dark" />
-
-</shape>

app/src/main/res/drawable/media_preview_unloaded_light.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/media_preview_unloaded_background_light" />
-
-    <stroke
-        android:dashWidth="4dp"
-        android:dashGap="4dp"
-        android:width="2dp"
-        android:color="#AFAFAF" />
-
-</shape>

app/src/main/res/drawable/media_warning_bg.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="8dp" />
-    <solid android:color="?attr/sensitive_media_warning_background_color" />
+    <solid  android:color="@color/color_background_transparent_60" />
 </shape>

app/src/main/res/drawable/poll_option_shape.xml

@@ -3,5 +3,5 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="6dp"/>
-    <solid android:color="?attr/pollOptionBackgroundColor" />
+    <solid android:color="?attr/colorBackgroundAccent" />
 </shape>

app/src/main/res/drawable/profile_badge_background.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <stroke android:width="1dp" android:color="@color/text_color_tertiary_light"/>
+    <stroke android:width="1dp" android:color="?android:attr/textColorTertiary"/>
     <corners android:radius="12dp"/>
     <padding android:bottom="2dp" android:top="2dp" android:left="8dp" android:right="8dp"/>
 </shape>

app/src/main/res/drawable/reblog_direct_light.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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_reblog_button_disabled_light"
-        android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z" />
-</vector>

app/src/main/res/drawable/reblog_private_light.xml

@@ -1,9 +0,0 @@
-<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_reblog_button_disabled_light"
-    android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
-</vector>

app/src/main/res/drawable/status_divider.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <size android:height="1dp" />
-    <solid android:color="@color/status_divider_light" />
+    <solid android:color="?attr/colorBackgroundAccent" />
 </shape>

app/src/main/res/drawable/status_divider_dark.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size android:height="1dp" />
-    <solid android:color="@color/status_divider_dark" />
-</shape>

app/src/main/res/drawable/status_divider_light.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size android:height="1dp" />
-    <solid android:color="@color/status_divider_light" />
-</shape>

app/src/main/res/layout-sw640dp/fragment_timeline.xml

@@ -3,13 +3,14 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+    android:background="?attr/windowBackgroundColor"
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="640dp"
         android:layout_height="match_parent"
         android:layout_gravity="center_horizontal"
-        android:background="?attr/window_background">
+        android:background="?android:attr/colorBackground">
 
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/swipeRefreshLayout"
@@ -56,5 +57,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
+
 </FrameLayout>

app/src/main/res/layout-sw640dp/fragment_timeline_notifications.xml

@@ -3,19 +3,20 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="?attr/windowBackgroundColor">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="640dp"
         android:layout_height="match_parent"
         android:layout_gravity="center_horizontal"
-        android:background="?attr/window_background">
+        android:background="?android:attr/colorBackground">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appBarOptions"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?android:colorBackground"
+            android:background="?attr/colorSurface"
             app:elevation="0dp"
             app:layout_behavior="com.keylesspalace.tusky.util.AppBarLayoutNoEmptyScrollBehavior">
 
@@ -64,7 +65,8 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recyclerView"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                android:background="?android:attr/colorBackground" />
 
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 

app/src/main/res/layout-sw640dp/fragment_view_thread.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="?attr/windowBackgroundColor">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipeRefreshLayout"
@@ -13,7 +14,7 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="?attr/window_background"
+            android:background="?android:attr/colorBackground"
             android:scrollbars="vertical" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 

app/src/main/res/layout/activity_account.xml

@@ -33,7 +33,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="180dp"
                     android:layout_alignTop="@+id/account_header_info"
-                    android:background="?attr/account_header_background_color"
+                    android:background="?attr/colorPrimaryDark"
                     android:scaleType="centerCrop"
                     app:layout_collapseMode="parallax"
                     app:layout_constraintStart_toStartOf="parent"
@@ -150,7 +150,7 @@
                         app:layout_constraintBottom_toBottomOf="@+id/accountUsernameTextView"
                         app:layout_constraintStart_toEndOf="@+id/accountUsernameTextView"
                         app:layout_constraintTop_toTopOf="@+id/accountUsernameTextView"
-                        app:srcCompat="@drawable/reblog_private_light"
+                        app:srcCompat="@drawable/ic_reblog_private_24dp"
                         tools:visibility="visible" />
                     
                     <TextView
@@ -376,7 +376,7 @@
                 style="@style/TuskyTabAppearance"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:colorBackground"
+                android:background="?attr/colorSurface"
                 app:tabGravity="center"
                 app:tabMode="scrollable"
                 app:tabTextAppearance="@style/TuskyTabAppearance" />
@@ -387,7 +387,7 @@
             android:id="@+id/accountFragmentViewPager"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="?attr/tab_page_margin_color"
+            android:background="?android:windowBackground"
             app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton

app/src/main/res/layout/activity_compose.xml

@@ -24,7 +24,7 @@
       
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/atButton"
-            style="?attr/image_button_style"
+            style="@style/TuskyImageButton"
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_gravity="end"
@@ -37,7 +37,7 @@
 
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/hashButton"
-            style="?attr/image_button_style"
+            style="@style/TuskyImageButton"
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_gravity="end"
@@ -50,7 +50,7 @@
         
         <ImageButton
             android:id="@+id/codeButton"
-            style="?attr/image_button_style"
+            style="@style/TuskyImageButton"
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_gravity="end"
@@ -61,7 +61,7 @@
         
         <ImageButton
             android:id="@+id/linkButton"
-            style="?attr/image_button_style"
+            style="@style/TuskyImageButton"
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_gravity="end"
@@ -72,7 +72,7 @@
         
         <ImageButton
             android:id="@+id/strikethroughButton"
-            style="?attr/image_button_style"
+            style="@style/TuskyImageButton"
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_gravity="end"
@@ -83,7 +83,7 @@
         
         <ImageButton
             android:id="@+id/italicButton"
-            style="?attr/image_button_style"
+            style="@style/TuskyImageButton"
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_gravity="end"
@@ -94,7 +94,7 @@
         
         <ImageButton
             android:id="@+id/boldButton"
-            style="?attr/image_button_style"
+            style="@style/TuskyImageButton"
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_gravity="end"
@@ -134,7 +134,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="2dp"
-                android:background="?attr/compose_reply_content_background"
+                android:background="?attr/colorBackgroundAccent"
                 android:lineSpacingMultiplier="1.1"
                 android:paddingLeft="16dp"
                 android:paddingTop="4dp"
@@ -212,7 +212,7 @@
         android:id="@+id/addMediaBottomSheet"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?android:colorBackground"
+        android:background="?attr/colorSurface"
         android:elevation="12dp"
         android:orientation="vertical"
         android:paddingStart="16dp"
@@ -255,7 +255,7 @@
         android:id="@+id/emojiView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?android:colorBackground"
+        android:background="?attr/colorSurface"
         android:clipToPadding="false"
         android:elevation="12dp"
         android:orientation="vertical"
@@ -271,7 +271,7 @@
         android:id="@+id/composeOptionsBottomSheet"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?android:colorBackground"
+        android:background="?attr/colorSurface"
         android:elevation="12dp"
         android:paddingStart="16dp"
         android:paddingTop="8dp"
@@ -285,7 +285,7 @@
         android:id="@+id/composeScheduleView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?android:colorBackground"
+        android:background="?attr/colorSurface"
         android:elevation="12dp"
         android:paddingStart="16dp"
         android:paddingTop="8dp"
@@ -299,8 +299,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:background="?android:colorBackground"
+        android:background="?attr/colorSurface"
         android:elevation="12dp"
+        android:animateLayoutChanges="true"
         android:gravity="center_vertical"
         android:paddingStart="8dp"
         android:paddingTop="4dp"
@@ -309,7 +310,7 @@
 
         <ImageButton
             android:id="@+id/composeAddMediaButton"
-            style="?attr/image_button_style"
+            style="@style/TuskyImageButton"
             android:layout_width="36dp"
             android:layout_height="36dp"
             android:layout_marginEnd="4dp"
@@ -320,7 +321,7 @@
 
         <ImageButton
             android:id="@+id/composeToggleVisibilityButton"
-            style="?attr/image_button_style"
+            style="@style/TuskyImageButton"
             android:layout_width="36dp"
             android:layout_height="36dp"
             android:layout_marginEnd="4dp"
@@ -331,19 +332,18 @@
 
         <ImageButton
             android:id="@+id/composeHideMediaButton"
-            style="?attr/image_button_style"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
+            style="@style/TuskyImageButton"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
             android:layout_marginEnd="4dp"
             android:contentDescription="@string/action_hide_media"
             android:padding="4dp"
             android:tooltipText="@string/action_hide_media"
-            android:visibility="gone"
             tools:src="@drawable/ic_eye_24dp" />
 
         <ImageButton
             android:id="@+id/composeContentWarningButton"
-            style="?attr/image_button_style"
+            style="@style/TuskyImageButton"
             android:layout_width="36dp"
             android:layout_height="36dp"
             android:layout_marginEnd="4dp"
@@ -354,7 +354,7 @@
 
         <ImageButton
             android:id="@+id/composeEmojiButton"
-            style="?attr/image_button_style"
+            style="@style/TuskyImageButton"
             android:layout_width="36dp"
             android:layout_height="36dp"
             android:layout_marginEnd="4dp"
@@ -365,7 +365,7 @@
 
         <ImageButton
             android:id="@+id/composeScheduleButton"
-            style="?attr/image_button_style"
+            style="@style/TuskyImageButton"
             android:layout_width="36dp"
             android:layout_height="36dp"
             android:layout_marginEnd="4dp"
@@ -376,7 +376,7 @@
 
         <ImageButton
             android:id="@+id/composeMarkdownButton"
-            style="?attr/image_button_style"
+            style="@style/TuskyImageButton"
             android:layout_width="36dp"
             android:layout_height="36dp"
             android:layout_marginEnd="4dp"

app/src/main/res/layout/activity_edit_profile.xml

@@ -139,7 +139,7 @@
                     android:paddingStart="8dp"
                     android:text="@string/lock_account_label"
                     android:textSize="?attr/status_text_medium"
-                    app:buttonTint="?attr/compound_button_color" />
+                    app:buttonTint="@color/compound_button_color" />
 
                 <TextView
                     android:layout_width="match_parent"

app/src/main/res/layout/activity_main.xml

@@ -11,6 +11,7 @@
         android:id="@+id/main_appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        app:elevationOverlayEnabled="false"
         android:elevation="@dimen/actionbar_elevation">
 
         <androidx.appcompat.widget.Toolbar
@@ -35,7 +36,7 @@
 
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/pager"
-        android:background="?attr/tab_page_margin_color"
+        android:background="?android:windowBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@id/tab_layout"

app/src/main/res/layout/activity_view_media.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/black"
+    android:background="@color/black"
     android:orientation="vertical">
 
     <androidx.viewpager2.widget.ViewPager2
@@ -15,7 +15,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="@color/toolbar_view_media"
+        android:background="@color/transparent_black"
         android:theme="@style/ViewMediaActivity.AppBarLayout"
         app:titleTextColor="@color/white" />
 

app/src/main/res/layout/dialog_add_poll.xml

@@ -49,7 +49,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
             android:text="@string/poll_allow_multiple_choices"
-            app:buttonTint="?attr/compound_button_color"
+            app:buttonTint="@color/compound_button_color"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/addChoiceButton" />
 

app/src/main/res/layout/fragment_accounts_in_list.xml

@@ -49,7 +49,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginTop="8dp"
-        android:background="?attr/window_background"
+        android:background="?android:attr/windowBackground"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout/fragment_report_note.xml

@@ -86,7 +86,7 @@
                 android:layout_marginTop="16dp"
                 android:text="@string/report_remote_instance"
                 android:textSize="?attr/status_text_medium"
-                app:buttonTint="?attr/compound_button_color"
+                app:buttonTint="@color/compound_button_color"
                 app:layout_constraintEnd_toEndOf="@id/guideEnd"
                 app:layout_constraintStart_toStartOf="@id/guideBegin"
                 app:layout_constraintTop_toBottomOf="@id/reportDescriptionRemoteInstance" />

app/src/main/res/layout/fragment_search.xml

@@ -3,8 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/layoutRoot"
     android:layout_width="@dimen/timeline_width"
-    android:layout_height="match_parent"
-    android:background="?attr/tab_page_margin_color">
+    android:layout_height="match_parent">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipeRefreshLayout"
@@ -16,7 +15,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="center"
-            android:background="?attr/window_background"
+            android:background="?android:attr/windowBackground"
             tools:listitem="@layout/item_account" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

app/src/main/res/layout/fragment_timeline.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/window_background">
+    android:background="?android:attr/colorBackground">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipeRefreshLayout"

app/src/main/res/layout/fragment_timeline_notifications.xml

@@ -9,7 +9,7 @@
         android:id="@+id/appBarOptions"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?android:colorBackground"
+        android:background="?attr/colorSurface"
         app:elevation="0dp"
         app:layout_behavior="com.keylesspalace.tusky.util.AppBarLayoutNoEmptyScrollBehavior">
 
@@ -58,8 +58,7 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?attr/window_background" />
+            android:layout_height="match_parent" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 

app/src/main/res/layout/fragment_view_thread.xml

@@ -9,7 +9,7 @@
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/window_background"
+        android:background="?android:attr/colorBackground"
         android:scrollbars="vertical" />
 
 </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

app/src/main/res/layout/item_add_poll_option.xml

@@ -20,7 +20,7 @@
 
     <ImageButton
         android:id="@+id/deleteButton"
-        style="?attr/image_button_style"
+        style="@style/TuskyImageButton"
         android:layout_marginStart="8dp"
         android:layout_width="32dp"
         android:layout_height="32dp"

app/src/main/res/layout/item_autocomplete_divider.xml

@@ -2,4 +2,4 @@
 <View xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/autocomplete_divider_drawable" />
+    android:background="@drawable/status_divider" />

app/src/main/res/layout/item_blocked_user.xml

@@ -19,7 +19,7 @@
 
     <ImageButton
         android:id="@+id/blocked_user_unblock"
-        style="?attr/image_button_style"
+        style="@style/TuskyImageButton"
         android:layout_width="32dp"
         android:layout_height="32dp"
         android:layout_alignParentEnd="true"

app/src/main/res/layout/item_conversation.xml

@@ -249,7 +249,7 @@
 
     <ImageButton
         android:id="@+id/status_reply"
-        style="?attr/image_button_style"
+        style="@style/TuskyImageButton"
         android:layout_width="30dp"
         android:layout_height="30dp"
         android:layout_marginTop="4dp"
@@ -273,9 +273,9 @@
         app:layout_constraintEnd_toStartOf="@id/status_bookmark"
         app:layout_constraintStart_toEndOf="@id/status_reply"
         app:layout_constraintTop_toTopOf="@id/status_reply"
-        sparkbutton:activeImage="?attr/status_favourite_active_drawable"
+        sparkbutton:activeImage="@drawable/ic_favourite_active_24dp"
         sparkbutton:iconSize="28dp"
-        sparkbutton:inactiveImage="?attr/status_favourite_inactive_drawable"
+        sparkbutton:inactiveImage="@drawable/ic_favourite_24dp"
         sparkbutton:primaryColor="@color/tusky_orange"
         sparkbutton:secondaryColor="@color/tusky_orange_light" />
 
@@ -298,7 +298,7 @@
 
     <ImageButton
         android:id="@+id/status_more"
-        style="?attr/image_button_style"
+        style="@style/TuskyImageButton"
         android:layout_width="24dp"
         android:layout_height="30dp"
         android:layout_marginEnd="8dp"

app/src/main/res/layout/item_emoji_pref.xml

@@ -96,7 +96,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/emojicompat_name"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_cancel_black_24dp" />
+        app:srcCompat="@drawable/ic_cancel_24dp" />
 
     <!--You'll probably want to select an emoji font, don't you?-->
     <androidx.appcompat.widget.AppCompatRadioButton
@@ -104,7 +104,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="visible"
-        app:buttonTint="?attr/compound_button_color"
+        app:buttonTint="@color/compound_button_color"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/emojicompat_name"