diff --git a/app/src/main/java/se/ajpanton/notificationlog/EventSettingsFragment.kt b/app/src/main/java/se/ajpanton/notificationlog/EventSettingsFragment.kt
index d3902a8..95f11cd 100644
--- a/app/src/main/java/se/ajpanton/notificationlog/EventSettingsFragment.kt
+++ b/app/src/main/java/se/ajpanton/notificationlog/EventSettingsFragment.kt
@@ -18,7 +18,6 @@ import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.lifecycle.lifecycleScope
-import com.google.android.material.color.MaterialColors
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.switchmaterial.SwitchMaterial
 import se.ajpanton.notificationlog.capture.SeenApps
@@ -293,13 +292,13 @@ class FilterAppsFragment : Fragment(R.layout.fragment_event_settings) {
                     }
                 }
                 holder.filter.contentDescription = "Edit logging events for ${app.label}"
-                holder.filter.imageTintList = ColorStateList.valueOf(
-                    MaterialColors.getColor(
-                        holder.filter,
-                        if (app.hasEventOverride) com.google.android.material.R.attr.colorPrimary
-                        else com.google.android.material.R.attr.colorOnSurface,
-                    ),
-                )
+                val colors = if (app.hasEventOverride) {
+                    R.color.app_filter_override_background to R.color.app_filter_override_icon
+                } else {
+                    R.color.app_filter_inherited_background to R.color.app_filter_inherited_icon
+                }
+                holder.filter.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(holder.filter.context, colors.first))
+                holder.filter.imageTintList = ColorStateList.valueOf(ContextCompat.getColor(holder.filter.context, colors.second))
                 holder.filter.setOnClickListener { onEventFilterClicked(app) }
             }
             if (holder is SectionTitleHolder && item is AppListItem.SectionTitle) {
diff --git a/app/src/main/java/se/ajpanton/notificationlog/LogDisplayFragment.kt b/app/src/main/java/se/ajpanton/notificationlog/LogDisplayFragment.kt
index 975a238..8519ce9 100644
--- a/app/src/main/java/se/ajpanton/notificationlog/LogDisplayFragment.kt
+++ b/app/src/main/java/se/ajpanton/notificationlog/LogDisplayFragment.kt
@@ -107,7 +107,7 @@ class LogDisplayFragment : Fragment(R.layout.fragment_log_display) {
     ): LinearLayout = LinearLayout(requireContext()).apply {
         orientation = LinearLayout.VERTICAL
         setPadding(dp(TIMESTAMP_CONTROLS_INDENT_DP), 0, 0, 0)
-        addDropdown("Timestamp timezone", listOf("Current local timezone", "UTC", "Local timezone when event happened"), TimestampZone.entries.indexOf(currentSettings().timestampZone)) { position ->
+        addDropdown("Timestamp timezone", listOf("Local timezone when event happened", "Current local timezone", "UTC"), TimestampZone.entries.indexOf(currentSettings().timestampZone)) { position ->
             val updated = currentSettings().copy(timestampZone = TimestampZone.entries[position])
             saveSettings(updated)
         }
diff --git a/app/src/main/java/se/ajpanton/notificationlog/settings/LogViewSettings.kt b/app/src/main/java/se/ajpanton/notificationlog/settings/LogViewSettings.kt
index 3622602..1784abf 100644
--- a/app/src/main/java/se/ajpanton/notificationlog/settings/LogViewSettings.kt
+++ b/app/src/main/java/se/ajpanton/notificationlog/settings/LogViewSettings.kt
@@ -1,7 +1,7 @@
 package se.ajpanton.notificationlog.settings
 
 enum class LogField { TIMESTAMP, APP_NAME, PACKAGE_NAME, ACTION, CONTENTS }
-enum class TimestampZone { LOCAL_NOW, UTC, EVENT_LOCAL }
+enum class TimestampZone { EVENT_LOCAL, LOCAL_NOW, UTC }
 enum class TimestampDateFormat { SYSTEM_DEFAULT, YEAR_MONTH_DAY, DAY_MONTH_YEAR, MONTH_DAY_YEAR }
 enum class TimestampClockFormat { SYSTEM_DEFAULT, HOUR_24, HOUR_12 }
 enum class DisplayEvent { APPEARING, DISAPPEARING, EDITS }
@@ -9,7 +9,7 @@ enum class DisplayEvent { APPEARING, DISAPPEARING, EDITS }
 data class LogViewSettings(
     val visibleFields: Set<LogField> = setOf(LogField.TIMESTAMP, LogField.APP_NAME, LogField.ACTION, LogField.CONTENTS),
     val order: List<LogField> = LogField.entries,
-    val timestampZone: TimestampZone = TimestampZone.LOCAL_NOW,
+    val timestampZone: TimestampZone = TimestampZone.EVENT_LOCAL,
     val timestampDateFormat: TimestampDateFormat = TimestampDateFormat.SYSTEM_DEFAULT,
     val timestampClockFormat: TimestampClockFormat = TimestampClockFormat.SYSTEM_DEFAULT,
     val visibleEvents: Set<DisplayEvent> = DisplayEvent.entries.toSet(),
diff --git a/app/src/main/java/se/ajpanton/notificationlog/settings/LogViewSettingsStore.kt b/app/src/main/java/se/ajpanton/notificationlog/settings/LogViewSettingsStore.kt
index b9e155f..ecc20fe 100644
--- a/app/src/main/java/se/ajpanton/notificationlog/settings/LogViewSettingsStore.kt
+++ b/app/src/main/java/se/ajpanton/notificationlog/settings/LogViewSettingsStore.kt
@@ -9,7 +9,7 @@ class LogViewSettingsStore(context: Context) {
         visibleFields = prefs.getStringSet("visible", LogViewSettings().visibleFields.map { it.name }.toSet())!!
             .map(LogField::valueOf).toSet(),
         order = prefs.getString("order", null)?.split(',')?.map(LogField::valueOf) ?: LogField.entries,
-        timestampZone = TimestampZone.valueOf(prefs.getString("zone", TimestampZone.LOCAL_NOW.name)!!),
+        timestampZone = TimestampZone.valueOf(prefs.getString("zone", TimestampZone.EVENT_LOCAL.name)!!),
         timestampDateFormat = TimestampDateFormat.valueOf(prefs.getString("date_format", TimestampDateFormat.SYSTEM_DEFAULT.name)!!),
         timestampClockFormat = TimestampClockFormat.valueOf(prefs.getString("clock_format", TimestampClockFormat.SYSTEM_DEFAULT.name)!!),
         visibleEvents = prefs.getStringSet("visible_events", DisplayEvent.entries.map { it.name }.toSet())!!
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 1dcf376..8074067 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -11,4 +11,8 @@
     <color name="log_row_separator">#8F8D96</color>
     <color name="dropdown_popup_background">#25262D</color>
     <color name="dropdown_popup_outline">#C7C5CF</color>
+    <color name="app_filter_inherited_background">#2D2E34</color>
+    <color name="app_filter_inherited_icon">#000000</color>
+    <color name="app_filter_override_background">#4A4B53</color>
+    <color name="app_filter_override_icon">#B8CCFF</color>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 0d1b039..891fd9b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -11,4 +11,8 @@
     <color name="log_row_separator">#A5A2AB</color>
     <color name="dropdown_popup_background">#FFFFFF</color>
     <color name="dropdown_popup_outline">#64646C</color>
+    <color name="app_filter_inherited_background">#DFDFE5</color>
+    <color name="app_filter_inherited_icon">#FFFFFF</color>
+    <color name="app_filter_override_background">#D0D0D8</color>
+    <color name="app_filter_override_icon">#34588E</color>
 </resources>