diff --git a/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/dialog/TimeDatePickerFragment.kt b/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/dialog/TimeDatePickerFragment.kt
index dfccc80b0..26679837c 100644
--- a/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/dialog/TimeDatePickerFragment.kt
+++ b/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/dialog/TimeDatePickerFragment.kt
@@ -1,11 +1,14 @@
 package com.skedgo.tripkit.ui.dialog
 
 import android.app.Dialog
+import android.graphics.drawable.ColorDrawable
+import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.text.TextUtils
 import android.text.format.Time
 import android.view.View
 import android.view.View.OnClickListener
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.DialogFragment
 import com.jakewharton.rxrelay2.PublishRelay
 import com.skedgo.tripkit.ui.R
@@ -13,6 +16,7 @@ import kankan.wheel.widget.WheelView
 import kankan.wheel.widget.adapters.ArrayWheelAdapter
 import kankan.wheel.widget.adapters.DaysAdapter
 import kankan.wheel.widget.adapters.NumericWheelAdapter
+import java.lang.reflect.Field
 import java.util.Calendar
 
 class TimeDatePickerFragment : DialogFragment(), OnClickListener {
@@ -113,9 +117,25 @@ class TimeDatePickerFragment : DialogFragment(), OnClickListener {
         mDaysView = view.findViewById<View>(R.id.daysView) as WheelView
         val dayRange = 60
         mDaysAdapter = DaysAdapter(this.activity, mCalendar, dayRange)
+        mDaysAdapter?.apply {
+            itemResource = R.layout.v4_view_wheel_time
+            itemTextResource = R.id.text
+        }
         mDaysView?.viewAdapter = mDaysAdapter
         mDaysView?.currentItem = (dayRange + 1) / 2
 
+        // Set shadow drawables for dark mode support
+        setWheelViewShadows(mDaysView)
+        setWheelViewShadows(mHoursView)
+        setWheelViewShadows(mMinutesView)
+        setWheelViewShadows(mAmPmView)
+
+        // Set center drawable and divider lines for dark mode support
+        setWheelViewCenterDrawable(mDaysView)
+        setWheelViewCenterDrawable(mHoursView)
+        setWheelViewCenterDrawable(mMinutesView)
+        setWheelViewCenterDrawable(mAmPmView)
+
         return dialog
     }
 
@@ -159,7 +179,77 @@ class TimeDatePickerFragment : DialogFragment(), OnClickListener {
         dismiss()
     }
 
+    /**
+     * Sets the top and bottom shadow drawables for a WheelView to support dark mode.
+     * Uses reflection to access private fields in the WheelView library.
+     */
+    private fun setWheelViewShadows(wheelView: WheelView?) {
+        if (wheelView == null) return
+
+        try {
+            val context = requireContext()
+            val topShadow = ContextCompat.getDrawable(context, R.drawable.top_shadow)
+            val bottomShadow = ContextCompat.getDrawable(context, R.drawable.bottom_shadow)
+
+            if (topShadow == null || bottomShadow == null) return
+
+            // Get shadow fields directly
+            val topShadowField = wheelView.javaClass.getDeclaredField(WHEEL_VIEW_FIELD_TOP_SHADOW)
+            topShadowField.isAccessible = true
+            
+            val bottomShadowField = wheelView.javaClass.getDeclaredField(WHEEL_VIEW_FIELD_BOTTOM_SHADOW)
+            bottomShadowField.isAccessible = true
+
+            // Set the shadow drawables
+            topShadowField.set(wheelView, topShadow)
+            bottomShadowField.set(wheelView, bottomShadow)
+
+            // Invalidate to refresh the view
+            wheelView.invalidate()
+        } catch (e: Exception) {
+            // Silently fail if reflection doesn't work (library might have changed)
+            e.printStackTrace()
+        }
+    }
+
+    /**
+     * Sets the divider lines for a WheelView to support dark mode.
+     * Uses reflection to access private fields in the WheelView library.
+     */
+    private fun setWheelViewCenterDrawable(wheelView: WheelView?) {
+        if (wheelView == null) return
+
+        try {
+            val context = requireContext()
+            // Use @color/black which inverts to white in dark mode
+            val dividerColor = ContextCompat.getColor(context, R.color.black)
+            val lineDrawable = ColorDrawable(dividerColor)
+
+            // Get line fields directly
+            val topLineField = wheelView.javaClass.getDeclaredField(WHEEL_VIEW_FIELD_TOP_LINE)
+            topLineField.isAccessible = true
+            
+            val bottomLineField = wheelView.javaClass.getDeclaredField(WHEEL_VIEW_FIELD_BOTTOM_LINE)
+            bottomLineField.isAccessible = true
+
+            // Set the drawables
+            topLineField.set(wheelView, lineDrawable)
+            bottomLineField.set(wheelView, lineDrawable)
+
+            // Invalidate to refresh the view
+            wheelView.invalidate()
+        } catch (e: Exception) {
+            // Silently fail if reflection doesn't work (library might have changed)
+            e.printStackTrace()
+        }
+    }
+
     companion object {
+        // WheelView reflection field names
+        private const val WHEEL_VIEW_FIELD_TOP_SHADOW = "topShadow"
+        private const val WHEEL_VIEW_FIELD_BOTTOM_SHADOW = "bottomShadow"
+        private const val WHEEL_VIEW_FIELD_TOP_LINE = "topLine"
+        private const val WHEEL_VIEW_FIELD_BOTTOM_LINE = "bottomLine"
         private const val ARG_TIME_TYPE = "timeType"
         private const val ARG_INITIATOR_ID = "initiatorId"
         private const val ARG_INITIAL_TIME = "initialTimeInMillis"
diff --git a/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/map/BearingMarkerIconBuilder.kt b/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/map/BearingMarkerIconBuilder.kt
index cc4f9e66d..5bfcb8d3d 100644
--- a/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/map/BearingMarkerIconBuilder.kt
+++ b/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/map/BearingMarkerIconBuilder.kt
@@ -5,12 +5,16 @@ import android.graphics.Bitmap
 import android.graphics.Bitmap.Config.ARGB_8888
 import android.graphics.BitmapFactory
 import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.ColorMatrix
+import android.graphics.ColorMatrixColorFilter
 import android.graphics.Paint
 import android.graphics.drawable.Drawable
 import android.util.Pair
 import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat
 import com.skedgo.tripkit.ui.R
+import com.skedgo.tripkit.ui.utils.isDarkMode
 import kotlin.math.abs
 
 class BearingMarkerIconBuilder(
@@ -160,10 +164,21 @@ class BearingMarkerIconBuilder(
 
         val canvas = Canvas(vehiclePointerPinBitmap)
 
+        // Apply dark mode tinting to base (make it darker for dark mode)
+        val basePaint = if (mContext.resources.isDarkMode()) {
+            Paint().apply {
+                colorFilter = createDarkenColorFilter()
+                isAntiAlias = true
+                isFilterBitmap = true
+            }
+        } else {
+            null
+        }
+
         // Locate the base
         val baseLeft = (vehiclePointerBitmap.width - baseBitmap.width) / 2
         val baseTop = vehiclePointerBitmap.height + padding
-        canvas.drawBitmap(baseBitmap, baseLeft.toFloat(), baseTop.toFloat(), null)
+        canvas.drawBitmap(baseBitmap, baseLeft.toFloat(), baseTop.toFloat(), basePaint)
         canvas.drawBitmap(vehiclePointerBitmap, 0f, 0f, null)
 
         return vehiclePointerPinBitmap
@@ -179,6 +194,17 @@ class BearingMarkerIconBuilder(
 
         val canvas = Canvas(vehiclePointerBitmap)
 
+        // Apply dark mode tinting to pointer (make it darker for dark mode)
+        val paint = if (mContext.resources.isDarkMode()) {
+            Paint().apply {
+                colorFilter = createDarkenColorFilter()
+                isAntiAlias = true
+                isFilterBitmap = true
+            }
+        } else {
+            null
+        }
+
         val rotateAngle = convertToCanvasAxes(mBearing)
         if (mHasBearing) {
             canvas.save()
@@ -189,11 +215,11 @@ class BearingMarkerIconBuilder(
                 (vehiclePointerBitmap.width / 2).toFloat(),
                 (vehiclePointerBitmap.height / 2).toFloat()
             )
-            canvas.drawBitmap(pointerBitmap, 0f, 0f, mRotationPaint)
+            canvas.drawBitmap(pointerBitmap, 0f, 0f, paint ?: mRotationPaint)
 
             canvas.restore()
         } else {
-            canvas.drawBitmap(pointerBitmap, 0f, 0f, null)
+            canvas.drawBitmap(pointerBitmap, 0f, 0f, paint)
         }
 
         pointerBitmap.recycle()
@@ -265,4 +291,22 @@ class BearingMarkerIconBuilder(
         drawable.draw(canvas)
         return bitmap
     }
+
+    /**
+     * Creates a ColorFilter that darkens white/light colors to medium-light gray for dark mode.
+     * This makes white pin markers visible on dark map backgrounds.
+     */
+    private fun createDarkenColorFilter(): ColorMatrixColorFilter {
+        // Color matrix that converts white (#FFFFFF) to medium-light gray (#999999 / 60% gray)
+        // while preserving alpha channel
+        val colorMatrix = ColorMatrix(
+            floatArrayOf(
+                0.6f, 0f, 0f, 0f, 0f,   // Red channel: reduce to 60% (153/255)
+                0f, 0.6f, 0f, 0f, 0f,   // Green channel: reduce to 60% (153/255)
+                0f, 0f, 0.6f, 0f, 0f,   // Blue channel: reduce to 60% (153/255)
+                0f, 0f, 0f, 1f, 0f      // Alpha channel: keep as-is
+            )
+        )
+        return ColorMatrixColorFilter(colorMatrix)
+    }
 }
\ No newline at end of file
diff --git a/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/search/SuggestionViewModel.kt b/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/search/SuggestionViewModel.kt
index eadc4af78..19ee6d89d 100644
--- a/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/search/SuggestionViewModel.kt
+++ b/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/search/SuggestionViewModel.kt
@@ -1,6 +1,7 @@
 package com.skedgo.tripkit.ui.search
 
 import android.content.Context
+    import android.graphics.PorterDuff
 import android.graphics.drawable.Drawable
 import androidx.core.content.ContextCompat
 import androidx.databinding.ObservableField
@@ -12,7 +13,7 @@ import com.skedgo.tripkit.ui.utils.TapAction
 import com.squareup.picasso.Picasso
 
 sealed class SuggestionViewModel(
-    context: Context,
+    protected val context: Context,
     val term: String? = null
 ) {
     val icon: ObservableField<Drawable?> = ObservableField()
@@ -32,6 +33,37 @@ sealed class SuggestionViewModel(
     abstract val onInfoClicked: TapAction<SuggestionViewModel>
 
     abstract val onSuggestionActionClicked: TapAction<SuggestionViewModel>
+
+    /**
+     * Applies tint programmatically to icons for dark mode support.
+     * 
+     * This approach is used because drawables are not uniform in format (some are PNGs which can't
+     * be easily themed with night-res) and not all can be supported with night-res theming. Some
+     * icons (like HOME and WORK) have circular backgrounds that would break if tinted, so we skip
+     * tinting for those. We'll audit and request proper night mode variants in the next dark mode
+     * support iteration.
+     */
+    protected fun applyIconTintIfNeeded(drawable: Drawable?, id: Any?, locationType: Int?): Drawable? {
+        if (drawable == null) return null
+        
+        // Skip tinting for HOME and WORK icons (they have circular backgrounds that would break with tinting)
+        // Check ID first (for FixedSuggestions from either package), then fall back to location type
+        val isHomeOrWork = if (id is Enum<*>) {
+            val enumName = id.name
+            enumName == "HOME" || enumName == "WORK"
+        } else {
+            false
+        } || locationType == Location.TYPE_HOME || locationType == Location.TYPE_WORK
+        
+        if (isHomeOrWork) {
+            return drawable
+        }
+        
+        // Apply tint for all other icons
+        val tintColor = ContextCompat.getColor(context, R.color.icon_tint_default)
+        drawable.mutate().setColorFilter(tintColor, PorterDuff.Mode.SRC_IN)
+        return drawable
+    }
 }
 
 open class FixedSuggestionViewModel(
@@ -54,7 +86,10 @@ open class FixedSuggestionViewModel(
         TapAction.create { this }
 
     init {
-        icon.set(suggestion.icon())
+        val originalIcon = suggestion.icon()
+        val suggestionId = suggestion.id()
+        val locationType = suggestion.location()?.locationType
+        icon.set(applyIconTintIfNeeded(originalIcon, suggestionId, locationType))
     }
 }
 
@@ -217,13 +252,15 @@ class GoogleAndTripGoSuggestionViewModel(
 
         when {
             place.icon() != null -> {
-                icon.set(place.icon())
+                val placeIcon = place.icon()
+                icon.set(applyIconTintIfNeeded(placeIcon, null, location.locationType))
             }
             iconRes == 0 -> {
                 icon.set(null)
             }
             else -> {
-                icon.set(ContextCompat.getDrawable(context, iconRes))
+                val drawable = ContextCompat.getDrawable(context, iconRes)
+                icon.set(applyIconTintIfNeeded(drawable, null, location.locationType))
             }
         }
     }
diff --git a/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/tripresults/GetTransportIconTintStrategy.kt b/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/tripresults/GetTransportIconTintStrategy.kt
index 9f7aa78ee..0687ba0ee 100644
--- a/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/tripresults/GetTransportIconTintStrategy.kt
+++ b/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/tripresults/GetTransportIconTintStrategy.kt
@@ -10,7 +10,7 @@ open class GetTransportIconTintStrategy @Inject constructor(private val resource
         Single.fromCallable {
             when (resources.getBoolean(R.bool.trip_kit_use_service_color)) {
                 true -> ApplyTintStrategy
-                false -> NoTintStrategy
+                false -> ThemeAwareApplyTintStrategy(resources)
             }
         }
 }
diff --git a/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/tripresults/ThemeAwareApplyTintStrategy.kt b/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/tripresults/ThemeAwareApplyTintStrategy.kt
new file mode 100644
index 000000000..0f974b83b
--- /dev/null
+++ b/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/tripresults/ThemeAwareApplyTintStrategy.kt
@@ -0,0 +1,35 @@
+package com.skedgo.tripkit.ui.tripresults
+
+import android.content.res.Resources
+import android.graphics.Color
+import android.graphics.drawable.Drawable
+import com.skedgo.tripkit.ui.utils.isDarkMode
+import com.skedgo.tripkit.ui.utils.tint
+import com.skedgo.tripkit.routing.ServiceColor
+
+/**
+ * Theme-aware tint strategy that applies white tint in dark mode when service colors are disabled.
+ * In light mode, returns drawable as-is. In dark mode, tints to white for visibility.
+ */
+class ThemeAwareApplyTintStrategy(private val resources: Resources) : TransportTintStrategy {
+    
+    override fun apply(
+        remoteIconIsTemplate: Boolean,
+        remoteIconIsBranding: Boolean,
+        serviceColor: ServiceColor?,
+        drawable: Drawable
+    ): Drawable {
+        // Don't tint branding icons (like Beam) - they should show original logo colors
+        if (remoteIconIsBranding) {
+            return drawable
+        }
+        
+        if (resources.isDarkMode()) {
+            // Dark mode: tint to white for visibility
+            return drawable.tint(Color.WHITE)
+        }
+        // Light mode: return drawable as-is (no tint)
+        return drawable
+    }
+}
+
diff --git a/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/utils/ResourcesExtensions.kt b/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/utils/ResourcesExtensions.kt
new file mode 100644
index 000000000..f221331de
--- /dev/null
+++ b/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/utils/ResourcesExtensions.kt
@@ -0,0 +1,13 @@
+package com.skedgo.tripkit.ui.utils
+
+import android.content.res.Configuration
+import android.content.res.Resources
+
+/**
+ * Checks if the app is currently in dark mode.
+ */
+fun Resources.isDarkMode(): Boolean {
+    val nightModeFlags = configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
+    return nightModeFlags == Configuration.UI_MODE_NIGHT_YES
+}
+
diff --git a/TripKitAndroidUI/src/main/res/drawable-hdpi/bg_round_corners_white.xml b/TripKitAndroidUI/src/main/res/drawable-hdpi/bg_round_corners_white.xml
index 7ad621b3e..6dfa1808b 100644
--- a/TripKitAndroidUI/src/main/res/drawable-hdpi/bg_round_corners_white.xml
+++ b/TripKitAndroidUI/src/main/res/drawable-hdpi/bg_round_corners_white.xml
@@ -3,7 +3,7 @@
     <item>
         <shape android:shape="rectangle">
             <corners android:radius="3dp" />
-            <solid android:color="@android:color/white" />
+            <solid android:color="@color/white" />
         </shape>
     </item>
 
diff --git a/TripKitAndroidUI/src/main/res/drawable-night/bottom_shadow.xml b/TripKitAndroidUI/src/main/res/drawable-night/bottom_shadow.xml
new file mode 100644
index 000000000..ecad9ade7
--- /dev/null
+++ b/TripKitAndroidUI/src/main/res/drawable-night/bottom_shadow.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:startColor="#212A33"
+        android:endColor="@android:color/transparent"
+        android:angle="90" />
+</shape>
+
diff --git a/TripKitAndroidUI/src/main/res/drawable-night/top_shadow.xml b/TripKitAndroidUI/src/main/res/drawable-night/top_shadow.xml
new file mode 100644
index 000000000..b7c2d05e1
--- /dev/null
+++ b/TripKitAndroidUI/src/main/res/drawable-night/top_shadow.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:startColor="#212A33"
+        android:endColor="@android:color/transparent"
+        android:angle="270" />
+</shape>
+
diff --git a/TripKitAndroidUI/src/main/res/drawable/back_green.xml b/TripKitAndroidUI/src/main/res/drawable/back_green.xml
index 643d673b8..a6ed143cd 100644
--- a/TripKitAndroidUI/src/main/res/drawable/back_green.xml
+++ b/TripKitAndroidUI/src/main/res/drawable/back_green.xml
@@ -4,6 +4,6 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path
-        android:fillColor="#23b15e"
+        android:fillColor="@color/colorPrimary"
         android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
 </vector>
diff --git a/TripKitAndroidUI/src/main/res/drawable/bg_custom_progress.xml b/TripKitAndroidUI/src/main/res/drawable/bg_custom_progress.xml
index 674445831..25ef62cd9 100644
--- a/TripKitAndroidUI/src/main/res/drawable/bg_custom_progress.xml
+++ b/TripKitAndroidUI/src/main/res/drawable/bg_custom_progress.xml
@@ -3,14 +3,14 @@
     <item android:id="@android:id/background">
         <shape android:shape="rectangle">
             <corners android:radius="12dp" /> <!-- Adjust the radius to control the roundness -->
-            <solid android:color="#ffffff" /> <!-- Background color of the ProgressBar -->
+            <solid android:color="@color/white" /> <!-- Background color of the ProgressBar -->
         </shape>
     </item>
     <item android:id="@android:id/progress">
         <scale android:scaleWidth="100%">
             <shape android:shape="rectangle">
                 <corners android:radius="12dp" /> <!-- Adjust the radius to match the background -->
-                <solid android:color="#00FF00" /> <!-- Progress color -->
+                <solid android:color="@color/colorPrimary" /> <!-- Progress color (overridden by progressTint) -->
             </shape>
         </scale>
     </item>
diff --git a/TripKitAndroidUI/src/main/res/drawable/bg_round_bottom_rect_white.xml b/TripKitAndroidUI/src/main/res/drawable/bg_round_bottom_rect_white.xml
index 094477090..7d0e589b8 100644
--- a/TripKitAndroidUI/src/main/res/drawable/bg_round_bottom_rect_white.xml
+++ b/TripKitAndroidUI/src/main/res/drawable/bg_round_bottom_rect_white.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@android:color/white" />
+    <solid android:color="@color/white" />
 
     <corners
         android:bottomLeftRadius="@dimen/spacing_normal"
diff --git a/TripKitAndroidUI/src/main/res/drawable/bg_round_corner_grey.xml b/TripKitAndroidUI/src/main/res/drawable/bg_round_corner_grey.xml
index 1fed0cc1a..4f87cf345 100644
--- a/TripKitAndroidUI/src/main/res/drawable/bg_round_corner_grey.xml
+++ b/TripKitAndroidUI/src/main/res/drawable/bg_round_corner_grey.xml
@@ -3,7 +3,7 @@
     <item>
         <shape android:shape="rectangle">
             <corners android:radius="12dp" />
-            <solid android:color="@android:color/darker_gray" />
+            <solid android:color="@color/grey4" />
         </shape>
     </item>
 
diff --git a/TripKitAndroidUI/src/main/res/drawable/bg_round_corner_light_grey.xml b/TripKitAndroidUI/src/main/res/drawable/bg_round_corner_light_grey.xml
index e4f81053d..a80a6debd 100644
--- a/TripKitAndroidUI/src/main/res/drawable/bg_round_corner_light_grey.xml
+++ b/TripKitAndroidUI/src/main/res/drawable/bg_round_corner_light_grey.xml
@@ -3,7 +3,7 @@
     <item>
         <shape android:shape="rectangle">
             <corners android:radius="12dp" />
-            <solid android:color="#f2f2f2" />
+            <solid android:color="@color/grey3" />
         </shape>
     </item>
 
diff --git a/TripKitAndroidUI/src/main/res/drawable/bg_round_rect_lt_grey.xml b/TripKitAndroidUI/src/main/res/drawable/bg_round_rect_lt_grey.xml
index 158611d99..01d05bdd4 100644
--- a/TripKitAndroidUI/src/main/res/drawable/bg_round_rect_lt_grey.xml
+++ b/TripKitAndroidUI/src/main/res/drawable/bg_round_rect_lt_grey.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="#f1f1f1" />
+    <solid android:color="@color/grey3" />
 
     <corners android:radius="@dimen/spacing_small" />
 
diff --git a/TripKitAndroidUI/src/main/res/drawable/bg_round_top_rect_white.xml b/TripKitAndroidUI/src/main/res/drawable/bg_round_top_rect_white.xml
index 5217bfec7..79fd9cd72 100644
--- a/TripKitAndroidUI/src/main/res/drawable/bg_round_top_rect_white.xml
+++ b/TripKitAndroidUI/src/main/res/drawable/bg_round_top_rect_white.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@android:color/white" />
+    <solid android:color="@color/white" />
 
     <corners
         android:topLeftRadius="@dimen/spacing_normal"
diff --git a/TripKitAndroidUI/src/main/res/drawable/black_circle.xml b/TripKitAndroidUI/src/main/res/drawable/black_circle.xml
index 21eff4b7a..72682f60c 100644
--- a/TripKitAndroidUI/src/main/res/drawable/black_circle.xml
+++ b/TripKitAndroidUI/src/main/res/drawable/black_circle.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="oval">
-            <solid android:color="@android:color/black" />
+            <solid android:color="@color/black" />
         </shape>
     </item>
 </layer-list>
diff --git a/TripKitAndroidUI/src/main/res/drawable/bottom_shadow.xml b/TripKitAndroidUI/src/main/res/drawable/bottom_shadow.xml
new file mode 100644
index 000000000..45b63335e
--- /dev/null
+++ b/TripKitAndroidUI/src/main/res/drawable/bottom_shadow.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:startColor="@android:color/white"
+        android:endColor="@android:color/transparent"
+        android:angle="90" />
+</shape>
+
diff --git a/TripKitAndroidUI/src/main/res/drawable/chevron_down.xml b/TripKitAndroidUI/src/main/res/drawable/chevron_down.xml
index 879974ed6..d05200e77 100644
--- a/TripKitAndroidUI/src/main/res/drawable/chevron_down.xml
+++ b/TripKitAndroidUI/src/main/res/drawable/chevron_down.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#000"
+        android:fillColor="@color/black"
         android:pathData="M7.41,8.58L12,13.17L16.59,8.58L18,10L12,16L6,10L7.41,8.58Z" />
 </vector>
\ No newline at end of file
diff --git a/TripKitAndroidUI/src/main/res/drawable/chevron_right.xml b/TripKitAndroidUI/src/main/res/drawable/chevron_right.xml
index 967f6040c..7081ed206 100644
--- a/TripKitAndroidUI/src/main/res/drawable/chevron_right.xml
+++ b/TripKitAndroidUI/src/main/res/drawable/chevron_right.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#000"
+        android:fillColor="@color/black"
         android:pathData="M8.59,16.58L13.17,12L8.59,7.41L10,6L16,12L10,18L8.59,16.58Z" />
 </vector>
\ No newline at end of file
diff --git a/TripKitAndroidUI/src/main/res/drawable/close.xml b/TripKitAndroidUI/src/main/res/drawable/close.xml
index 5c3134741..14c996306 100644
--- a/TripKitAndroidUI/src/main/res/drawable/close.xml
+++ b/TripKitAndroidUI/src/main/res/drawable/close.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#000"
+        android:fillColor="@color/black"
         android:pathData="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z" />
 </vector>
\ No newline at end of file
diff --git a/TripKitAndroidUI/src/main/res/drawable/dots_vertical.xml b/TripKitAndroidUI/src/main/res/drawable/dots_vertical.xml
index 3754d89a8..ef1faeec1 100644
--- a/TripKitAndroidUI/src/main/res/drawable/dots_vertical.xml
+++ b/TripKitAndroidUI/src/main/res/drawable/dots_vertical.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#000"
+        android:fillColor="@color/black"
         android:pathData="M12,16A2,2 0 0,1 14,18A2,2 0 0,1 12,20A2,2 0 0,1 10,18A2,2 0 0,1 12,16M12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12A2,2 0 0,1 12,10M12,4A2,2 0 0,1 14,6A2,2 0 0,1 12,8A2,2 0 0,1 10,6A2,2 0 0,1 12,4Z" />
 </vector>
\ No newline at end of file
diff --git a/TripKitAndroidUI/src/main/res/drawable/ic_back_button.xml b/TripKitAndroidUI/src/main/res/drawable/ic_back_button.xml
index 0db0801aa..f6fc721c1 100644
--- a/TripKitAndroidUI/src/main/res/drawable/ic_back_button.xml
+++ b/TripKitAndroidUI/src/main/res/drawable/ic_back_button.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#fff"
+        android:fillColor="@android:color/white"
         android:pathData="M20,11V13H8L13.5,18.5L12.08,19.92L4.16,12L12.08,4.08L13.5,5.5L8,11H20Z" />
 </vector>
\ No newline at end of file
diff --git a/TripKitAndroidUI/src/main/res/drawable/ic_nav_my_location.xml b/TripKitAndroidUI/src/main/res/drawable/ic_nav_my_location.xml
index 08486a933..6a73aa0d7 100644
--- a/TripKitAndroidUI/src/main/res/drawable/ic_nav_my_location.xml
+++ b/TripKitAndroidUI/src/main/res/drawable/ic_nav_my_location.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#000"
+        android:fillColor="@color/black"
         android:pathData="M12,8A4,4 0 0,1 16,12A4,4 0 0,1 12,16A4,4 0 0,1 8,12A4,4 0 0,1 12,8M3.05,13H1V11H3.05C3.5,6.83 6.83,3.5 11,3.05V1H13V3.05C17.17,3.5 20.5,6.83 20.95,11H23V13H20.95C20.5,17.17 17.17,20.5 13,20.95V23H11V20.95C6.83,20.5 3.5,17.17 3.05,13M12,5A7,7 0 0,0 5,12A7,7 0 0,0 12,19A7,7 0 0,0 19,12A7,7 0 0,0 12,5Z" />
 </vector>
\ No newline at end of file
diff --git a/TripKitAndroidUI/src/main/res/drawable/ic_pin.xml b/TripKitAndroidUI/src/main/res/drawable/ic_pin.xml
index a7f73a644..994b5ff84 100644
--- a/TripKitAndroidUI/src/main/res/drawable/ic_pin.xml
+++ b/TripKitAndroidUI/src/main/res/drawable/ic_pin.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="24">
     <path
         android:pathData="M13,20.1402C13,21.5105 12.6562,21.8589 12,23.0619C11.3438,21.8589 11,21.5105 11,20.1402L11,17L13,17L13,20.1402ZM12,16C8.134,16 5,12.866 5,9C5,5.134 8.134,2 12,2C15.866,2 19,5.134 19,9C19,12.866 15.866,16 12,16ZM12,11C13.1046,11 14,10.1046 14,9C14,7.8954 13.1046,7 12,7C10.8954,7 10,7.8954 10,9C10,10.1046 10.8954,11 12,11Z"
-        android:fillColor="#212A33"
+        android:fillColor="@color/black"
         android:fillType="evenOdd" />
 </vector>
diff --git a/TripKitAndroidUI/src/main/res/drawable/location_search_input_box_background_selected.xml b/TripKitAndroidUI/src/main/res/drawable/location_search_input_box_background_selected.xml
index 5ef4490a3..6a4ac593b 100644
--- a/TripKitAndroidUI/src/main/res/drawable/location_search_input_box_background_selected.xml
+++ b/TripKitAndroidUI/src/main/res/drawable/location_search_input_box_background_selected.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="@android:color/white" />
+    <solid android:color="@color/white" />
     <stroke
         android:width="1dp"
         android:color="@color/colorPrimary" />
diff --git a/TripKitAndroidUI/src/main/res/drawable/location_search_input_box_background_unselected.xml b/TripKitAndroidUI/src/main/res/drawable/location_search_input_box_background_unselected.xml
index fdad7825c..495ff2991 100644
--- a/TripKitAndroidUI/src/main/res/drawable/location_search_input_box_background_unselected.xml
+++ b/TripKitAndroidUI/src/main/res/drawable/location_search_input_box_background_unselected.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="@android:color/white" />
+    <solid android:color="@color/white" />
     <stroke
         android:width="1dp"
         android:color="@color/black3" />
diff --git a/TripKitAndroidUI/src/main/res/drawable/route_input_edit_text_background.xml b/TripKitAndroidUI/src/main/res/drawable/route_input_edit_text_background.xml
index 752b23004..171a64c20 100644
--- a/TripKitAndroidUI/src/main/res/drawable/route_input_edit_text_background.xml
+++ b/TripKitAndroidUI/src/main/res/drawable/route_input_edit_text_background.xml
@@ -2,14 +2,14 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="true" android:state_focused="true">
         <shape android:padding="10dp" android:shape="rectangle">
-            <solid android:color="#FFFFFF" />
+            <solid android:color="@color/white" />
             <stroke android:width="2dp" android:color="@color/tripKitPrimary" />
             <corners android:radius="6dp" />
         </shape>
     </item>
     <item android:state_enabled="true">
         <shape android:padding="10dp" android:shape="rectangle">
-            <solid android:color="#FFFFFF" />
+            <solid android:color="@color/white" />
             <stroke android:width="1dp" android:color="@color/black3" />
             <corners android:radius="6dp" />
         </shape>
diff --git a/TripKitAndroidUI/src/main/res/drawable/small_circle.xml b/TripKitAndroidUI/src/main/res/drawable/small_circle.xml
index f2c2d8490..79e6af5d4 100644
--- a/TripKitAndroidUI/src/main/res/drawable/small_circle.xml
+++ b/TripKitAndroidUI/src/main/res/drawable/small_circle.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#000"
+        android:fillColor="@color/black"
         android:pathData="M12,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,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
 </vector>
\ No newline at end of file
diff --git a/TripKitAndroidUI/src/main/res/drawable/swap_vertical.xml b/TripKitAndroidUI/src/main/res/drawable/swap_vertical.xml
index 1be41dca3..25a238dae 100644
--- a/TripKitAndroidUI/src/main/res/drawable/swap_vertical.xml
+++ b/TripKitAndroidUI/src/main/res/drawable/swap_vertical.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#000"
+        android:fillColor="@color/black"
         android:pathData="M9,3L5,7H8V14H10V7H13M16,17V10H14V17H11L15,21L19,17H16Z" />
 </vector>
\ No newline at end of file
diff --git a/TripKitAndroidUI/src/main/res/drawable/top_shadow.xml b/TripKitAndroidUI/src/main/res/drawable/top_shadow.xml
new file mode 100644
index 000000000..ee652fdfb
--- /dev/null
+++ b/TripKitAndroidUI/src/main/res/drawable/top_shadow.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:startColor="@android:color/white"
+        android:endColor="@android:color/transparent"
+        android:angle="270" />
+</shape>
+
diff --git a/TripKitAndroidUI/src/main/res/drawable/trip_result_transport_mode_selector_background.xml b/TripKitAndroidUI/src/main/res/drawable/trip_result_transport_mode_selector_background.xml
index 135120cd7..6655cb259 100644
--- a/TripKitAndroidUI/src/main/res/drawable/trip_result_transport_mode_selector_background.xml
+++ b/TripKitAndroidUI/src/main/res/drawable/trip_result_transport_mode_selector_background.xml
@@ -3,13 +3,12 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_checked="true">
         <shape android:shape="oval">
-            <solid android:color="@android:color/white" />
+            <solid android:color="@color/transport_mode_selector_checked" />
         </shape>
-
     </item>
     <item android:state_checked="false">
         <shape android:shape="oval">
-            <solid android:color="@color/black4" />
+            <solid android:color="@color/transport_mode_selector_unchecked" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/TripKitAndroidUI/src/main/res/layout/bike_share_info_window.xml b/TripKitAndroidUI/src/main/res/layout/bike_share_info_window.xml
index 3b343115f..7dc2d0f2f 100644
--- a/TripKitAndroidUI/src/main/res/layout/bike_share_info_window.xml
+++ b/TripKitAndroidUI/src/main/res/layout/bike_share_info_window.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout 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:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@android:color/white"
     android:foreground="?selectableItemBackground"
     android:padding="8dp">
 
@@ -14,6 +14,7 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:layout_marginBottom="8dp"
+        android:textColor="@android:color/black"
         android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
         tools:text="Sydney Bike Share" />
 
@@ -35,6 +36,7 @@
         android:layout_toRightOf="@id/bikeShareIcon"
         android:padding="8dp"
         android:text="@string/available_bikes"
+        android:textColor="@android:color/black"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
     <TextView
@@ -44,11 +46,11 @@
         android:layout_alignBottom="@id/availableBikesText"
         android:layout_marginLeft="8dp"
         android:layout_toRightOf="@id/availableBikesText"
-        android:background="?colorPrimary"
         android:gravity="center_horizontal"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium.Inverse"
+        android:textColor="@android:color/black"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         tools:text="24" />
 
     <TextView
@@ -59,6 +61,7 @@
         android:layout_toRightOf="@id/bikeShareIcon"
         android:padding="8dp"
         android:text="@string/empty_docks"
+        android:textColor="@android:color/black"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
     <TextView
@@ -68,11 +71,11 @@
         android:layout_alignBottom="@id/batteryLevelText"
         android:layout_alignRight="@id/availableBikes"
         android:layout_marginLeft="8dp"
-        android:background="?colorPrimary"
         android:gravity="center_horizontal"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium.Inverse"
+        android:textColor="@android:color/black"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         tools:text="15" />
 
     <ImageView
diff --git a/TripKitAndroidUI/src/main/res/layout/city_callout.xml b/TripKitAndroidUI/src/main/res/layout/city_callout.xml
index 36824b3cd..2b5cceed6 100644
--- a/TripKitAndroidUI/src/main/res/layout/city_callout.xml
+++ b/TripKitAndroidUI/src/main/res/layout/city_callout.xml
@@ -7,6 +7,6 @@
     android:drawableRight="@drawable/ic_zoom"
     android:ellipsize="marquee"
     android:singleLine="true"
-    android:textColor="@color/v4_title_text"
+    android:textColor="@android:color/black"
     android:textSize="16sp"
     tools:text="Sydney, New South Wales, Australia" />
\ No newline at end of file
diff --git a/TripKitAndroidUI/src/main/res/layout/dialog_generic_list.xml b/TripKitAndroidUI/src/main/res/layout/dialog_generic_list.xml
index 855179c2b..8577c60fe 100644
--- a/TripKitAndroidUI/src/main/res/layout/dialog_generic_list.xml
+++ b/TripKitAndroidUI/src/main/res/layout/dialog_generic_list.xml
@@ -17,7 +17,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@android:color/white">
+        android:background="@color/white">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/genericList_cl_header"
@@ -94,7 +94,7 @@
                 android:layout_height="wrap_content"
                 android:text="@{viewModel.descriptionTitle}"
                 android:textStyle="bold"
-                android:textColor="@android:color/black"
+                android:textColor="@color/black"
                 tools:text="Test" />
 
             <TextView
@@ -103,7 +103,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@{viewModel.description}"
-                android:textColor="@android:color/black"
+                android:textColor="@color/black"
                 tools:text="Test" />
 
         </LinearLayout>
diff --git a/TripKitAndroidUI/src/main/res/layout/dialog_generic_list_old.xml b/TripKitAndroidUI/src/main/res/layout/dialog_generic_list_old.xml
index 36e784e81..6573193c9 100644
--- a/TripKitAndroidUI/src/main/res/layout/dialog_generic_list_old.xml
+++ b/TripKitAndroidUI/src/main/res/layout/dialog_generic_list_old.xml
@@ -4,7 +4,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@android:color/white"
+        android:background="@color/white"
         android:orientation="vertical">
 
         <FrameLayout
diff --git a/TripKitAndroidUI/src/main/res/layout/dialog_generic_webview.xml b/TripKitAndroidUI/src/main/res/layout/dialog_generic_webview.xml
index 7f06d1120..61c0ef084 100644
--- a/TripKitAndroidUI/src/main/res/layout/dialog_generic_webview.xml
+++ b/TripKitAndroidUI/src/main/res/layout/dialog_generic_webview.xml
@@ -17,7 +17,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@android:color/white">
+        android:background="@color/white">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/genericWebView_cl_header"
diff --git a/TripKitAndroidUI/src/main/res/layout/dialog_tkui_card_container.xml b/TripKitAndroidUI/src/main/res/layout/dialog_tkui_card_container.xml
index 4ff52f34d..9c03fe81d 100644
--- a/TripKitAndroidUI/src/main/res/layout/dialog_tkui_card_container.xml
+++ b/TripKitAndroidUI/src/main/res/layout/dialog_tkui_card_container.xml
@@ -3,4 +3,4 @@
     android:id="@+id/contentFrame"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/white" />
+    android:background="@color/white" />
diff --git a/TripKitAndroidUI/src/main/res/layout/dialog_update.xml b/TripKitAndroidUI/src/main/res/layout/dialog_update.xml
index 7f1fcf78f..e7d7594af 100644
--- a/TripKitAndroidUI/src/main/res/layout/dialog_update.xml
+++ b/TripKitAndroidUI/src/main/res/layout/dialog_update.xml
@@ -34,7 +34,7 @@
                     android:enabled="false"
                     android:gravity="center"
                     android:text="@string/str_updating"
-                    android:textColor="@android:color/black" />
+                    android:textColor="@color/black" />
 
             </LinearLayout>
         </androidx.cardview.widget.CardView>
diff --git a/TripKitAndroidUI/src/main/res/layout/fragment_generic_note.xml b/TripKitAndroidUI/src/main/res/layout/fragment_generic_note.xml
index 8c438500b..c689b338f 100644
--- a/TripKitAndroidUI/src/main/res/layout/fragment_generic_note.xml
+++ b/TripKitAndroidUI/src/main/res/layout/fragment_generic_note.xml
@@ -6,7 +6,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@android:color/white">
+        android:background="@color/white">
 
         <androidx.appcompat.widget.AppCompatEditText
             android:id="@+id/genericList_rv_selection"
diff --git a/TripKitAndroidUI/src/main/res/layout/fragment_location_pointer.xml b/TripKitAndroidUI/src/main/res/layout/fragment_location_pointer.xml
index e840f2a42..444071f4b 100644
--- a/TripKitAndroidUI/src/main/res/layout/fragment_location_pointer.xml
+++ b/TripKitAndroidUI/src/main/res/layout/fragment_location_pointer.xml
@@ -13,7 +13,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@android:color/white"
+        android:background="@color/white"
         android:paddingTop="12dp"
         tools:context=".chooser.LocationChooserFragment">
 
@@ -36,6 +36,7 @@
             android:background="?attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/desc_close"
             android:src="@drawable/close"
+            app:tint="@color/icon_tint_default"
             app:layout_constraintBottom_toBottomOf="@+id/chooseText"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@+id/chooseText" />
@@ -56,7 +57,8 @@
             android:visibility="@{!viewModel.showSpinner}"
             app:layout_constraintStart_toStartOf="@id/chooseText"
             app:layout_constraintTop_toBottomOf="@id/chooseText"
-            app:srcCompat="@drawable/ic_search" />
+            app:srcCompat="@drawable/ic_search"
+            app:tint="@color/icon_tint_default" />
 
         <TextView
             android:id="@+id/locationTextView"
@@ -86,7 +88,8 @@
             app:layout_constraintBottom_toBottomOf="@id/locationTextView"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/chooseText"
-            app:srcCompat="@drawable/ic_icon_info" />
+            app:srcCompat="@drawable/ic_icon_info"
+            app:tint="@color/icon_tint_default" />
 
         <View
             android:id="@+id/divider"
diff --git a/TripKitAndroidUI/src/main/res/layout/fragment_tkui_card.xml b/TripKitAndroidUI/src/main/res/layout/fragment_tkui_card.xml
index b7d5ce92b..1d598a277 100644
--- a/TripKitAndroidUI/src/main/res/layout/fragment_tkui_card.xml
+++ b/TripKitAndroidUI/src/main/res/layout/fragment_tkui_card.xml
@@ -5,7 +5,7 @@
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:cardBackgroundColor="@android:color/white"
+        app:cardBackgroundColor="@color/white"
         app:cardCornerRadius="@dimen/cardview_corner_radius">
 
         <LinearLayout
@@ -13,7 +13,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical"
-            android:background="@android:color/white"
+            android:background="@color/white"
             android:padding="16dp">
 
             <FrameLayout
@@ -37,6 +37,7 @@
                 android:layout_height="24dp"
                 android:layout_gravity="end"
                 android:src="@android:drawable/ic_menu_close_clear_cancel"
+                app:tint="@color/icon_tint_default"
                 android:visibility="gone"
                 android:contentDescription="Close" />
 
diff --git a/TripKitAndroidUI/src/main/res/layout/fragment_tkui_date_time_picker_dialog.xml b/TripKitAndroidUI/src/main/res/layout/fragment_tkui_date_time_picker_dialog.xml
index 43db2c294..e15524d8f 100644
--- a/TripKitAndroidUI/src/main/res/layout/fragment_tkui_date_time_picker_dialog.xml
+++ b/TripKitAndroidUI/src/main/res/layout/fragment_tkui_date_time_picker_dialog.xml
@@ -154,7 +154,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:datePickerMode="spinner"
-                            android:background="@android:color/white"
+                            android:background="@color/white"
                             android:spinnersShown="false"
                             app:layout_constraintTop_toTopOf="parent"
                             android:focusedMonthDateColor="@color/tripKitWarning"
diff --git a/TripKitAndroidUI/src/main/res/layout/fragment_tkui_location_search_view_controller.xml b/TripKitAndroidUI/src/main/res/layout/fragment_tkui_location_search_view_controller.xml
index bf3d6f1d9..5fefe50ba 100644
--- a/TripKitAndroidUI/src/main/res/layout/fragment_tkui_location_search_view_controller.xml
+++ b/TripKitAndroidUI/src/main/res/layout/fragment_tkui_location_search_view_controller.xml
@@ -13,7 +13,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@android:color/white"
+        android:background="@color/white"
         android:clickable="true"
         android:focusable="true"
         android:paddingTop="@dimen/content_padding">
diff --git a/TripKitAndroidUI/src/main/res/layout/fragment_tkui_route.xml b/TripKitAndroidUI/src/main/res/layout/fragment_tkui_route.xml
index cce3e676e..5516b403a 100644
--- a/TripKitAndroidUI/src/main/res/layout/fragment_tkui_route.xml
+++ b/TripKitAndroidUI/src/main/res/layout/fragment_tkui_route.xml
@@ -16,7 +16,7 @@
         android:focusable="false"
         android:importantForAccessibility="no"
         android:paddingTop="12dp"
-        android:background="@android:color/white"
+        android:background="@color/white"
         tools:context=".routing.RouteCardFragment">
 
         <TextView
diff --git a/TripKitAndroidUI/src/main/res/layout/fragment_tkui_trip_details_view_controller.xml b/TripKitAndroidUI/src/main/res/layout/fragment_tkui_trip_details_view_controller.xml
index e3d013d07..c783ecd6b 100644
--- a/TripKitAndroidUI/src/main/res/layout/fragment_tkui_trip_details_view_controller.xml
+++ b/TripKitAndroidUI/src/main/res/layout/fragment_tkui_trip_details_view_controller.xml
@@ -5,7 +5,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@android:color/white"
+        android:background="@color/white"
         android:clickable="true"
         android:focusable="true">
 
@@ -41,7 +41,7 @@
                 android:enabled="false"
                 android:gravity="center"
                 android:text="@string/loading"
-                android:textColor="@android:color/black" />
+                android:textColor="@color/black" />
 
         </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/TripKitAndroidUI/src/main/res/layout/fragment_tkui_trip_preview.xml b/TripKitAndroidUI/src/main/res/layout/fragment_tkui_trip_preview.xml
index 695922210..6ecd6c016 100644
--- a/TripKitAndroidUI/src/main/res/layout/fragment_tkui_trip_preview.xml
+++ b/TripKitAndroidUI/src/main/res/layout/fragment_tkui_trip_preview.xml
@@ -11,7 +11,7 @@
             android:id="@+id/vpTripPreview"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@android:color/white"
+            android:background="@color/white"
             android:focusable="false"
             android:importantForAccessibility="no" />
     </FrameLayout>
diff --git a/TripKitAndroidUI/src/main/res/layout/fragment_tkui_trip_results.xml b/TripKitAndroidUI/src/main/res/layout/fragment_tkui_trip_results.xml
index 5aa4b3ff7..5084fd9a7 100644
--- a/TripKitAndroidUI/src/main/res/layout/fragment_tkui_trip_results.xml
+++ b/TripKitAndroidUI/src/main/res/layout/fragment_tkui_trip_results.xml
@@ -4,7 +4,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@android:color/white"
+        android:background="@color/white"
         android:clickable="true"
         android:focusable="true"
         android:paddingTop="12dp">
diff --git a/TripKitAndroidUI/src/main/res/layout/free_floating_vehicle_info_window.xml b/TripKitAndroidUI/src/main/res/layout/free_floating_vehicle_info_window.xml
index f62163d5a..e906474a2 100644
--- a/TripKitAndroidUI/src/main/res/layout/free_floating_vehicle_info_window.xml
+++ b/TripKitAndroidUI/src/main/res/layout/free_floating_vehicle_info_window.xml
@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@android:color/white"
     android:padding="8dp"
     tools:ignore="UnusedAttribute">
 
@@ -13,6 +12,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
+        android:textColor="@android:color/black"
         android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -25,6 +25,7 @@
         android:drawablePadding="@dimen/spacing_small"
         android:padding="8dp"
         android:text="@string/kickscooter"
+        android:textColor="@android:color/black"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/operatorName" />
@@ -38,6 +39,7 @@
         android:gravity="center"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
+        android:textColor="@android:color/black"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         app:layout_constraintBottom_toBottomOf="@+id/type"
         app:layout_constraintStart_toEndOf="@+id/type"
@@ -52,6 +54,7 @@
         android:drawablePadding="@dimen/spacing_small"
         android:padding="8dp"
         android:text="@string/battery"
+        android:textColor="@android:color/black"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/type" />
@@ -65,6 +68,7 @@
         android:gravity="center"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
+        android:textColor="@android:color/black"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         app:layout_constraintBottom_toBottomOf="@+id/batteryLevelText"
         app:layout_constraintStart_toEndOf="@+id/batteryLevelText"
diff --git a/TripKitAndroidUI/src/main/res/layout/item_drt.xml b/TripKitAndroidUI/src/main/res/layout/item_drt.xml
index ff254bf7e..fea26fc3f 100644
--- a/TripKitAndroidUI/src/main/res/layout/item_drt.xml
+++ b/TripKitAndroidUI/src/main/res/layout/item_drt.xml
@@ -67,7 +67,7 @@
                 android:paddingHorizontal="@dimen/spacing_small"
                 android:text="@string/lbl_required"
                 android:textAlignment="center"
-                android:textColor="@color/grey3"
+                android:textColor="@android:color/white"
                 android:textSize="@dimen/font_size_small"
                 android:visibility="@{viewModel.required &amp;&amp; !viewModel.viewMode}"
                 app:layout_constraintBottom_toBottomOf="@+id/itemDrt_tvLabel"
@@ -143,7 +143,7 @@
             <View
                 android:layout_width="1dp"
                 android:layout_height="0dp"
-                android:background="@android:color/white"
+                android:background="@color/white"
                 android:elevation="10dp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/TripKitAndroidUI/src/main/res/layout/item_drt_ticket.xml b/TripKitAndroidUI/src/main/res/layout/item_drt_ticket.xml
index 1914f5e99..3ae05481a 100644
--- a/TripKitAndroidUI/src/main/res/layout/item_drt_ticket.xml
+++ b/TripKitAndroidUI/src/main/res/layout/item_drt_ticket.xml
@@ -56,7 +56,7 @@
                 android:paddingHorizontal="@dimen/spacing_small"
                 android:text="@string/lbl_required"
                 android:textAlignment="center"
-                android:textColor="@color/grey3"
+                android:textColor="@android:color/white"
                 android:textSize="@dimen/font_size_small"
                 android:visibility="@{viewModel.required &amp; !viewModel.viewMode}"
                 app:layout_constraintBottom_toBottomOf="@+id/itemDrt_tvLabel"
diff --git a/TripKitAndroidUI/src/main/res/layout/item_service_alert.xml b/TripKitAndroidUI/src/main/res/layout/item_service_alert.xml
index d4c72021e..5faa42fe7 100644
--- a/TripKitAndroidUI/src/main/res/layout/item_service_alert.xml
+++ b/TripKitAndroidUI/src/main/res/layout/item_service_alert.xml
@@ -24,6 +24,7 @@
             android:src="@{item.severity()}"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
+            app:tint="@color/icon_tint_default"
             tools:src="@drawable/ic_action_warning" />
 
         <TextView
@@ -56,6 +57,7 @@
             android:textSize="@dimen/font_size_normal"
             android:layout_marginTop="@dimen/spacing_small"
             android:text="@{item.text()}"
+            android:textColor="@color/black"
             app:layout_constraintTop_toBottomOf="@+id/tvTitle"
             tools:text="Description here" />
 
diff --git a/TripKitAndroidUI/src/main/res/layout/item_trip_segment_summary.xml b/TripKitAndroidUI/src/main/res/layout/item_trip_segment_summary.xml
index 141886853..1b87330a2 100644
--- a/TripKitAndroidUI/src/main/res/layout/item_trip_segment_summary.xml
+++ b/TripKitAndroidUI/src/main/res/layout/item_trip_segment_summary.xml
@@ -21,13 +21,14 @@
             android:layout_width="@dimen/close_button_size"
             android:layout_height="@dimen/close_button_size"
             android:src="@{viewModel.icon}"
+            app:tint="@color/black"
             app:customImageTint="@{viewModel.selected? @color/colorPrimary : 0}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:mirrorImage="@{viewModel.isMirrored()}"
             tools:src="@drawable/ic_train"
-            tools:tint="@color/colorPrimary" />
+            tools:tint="@color/black" />
 
         <TextView
             android:id="@+id/tvTitle"
diff --git a/TripKitAndroidUI/src/main/res/layout/layout_favorite_button.xml b/TripKitAndroidUI/src/main/res/layout/layout_favorite_button.xml
index 0f70e7808..f9830d7a1 100644
--- a/TripKitAndroidUI/src/main/res/layout/layout_favorite_button.xml
+++ b/TripKitAndroidUI/src/main/res/layout/layout_favorite_button.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/favoriteButton"
     android:layout_width="0dp"
     android:layout_height="wrap_content"
@@ -21,7 +22,7 @@
         android:clickable="false"
         android:focusable="false"
         android:src="@drawable/ic_favorite"
-        android:tint="@color/black2" />
+        app:tint="@color/icon_tint_default" />
 
     <TextView
         style="@style/TextAppearance.MaterialComponents.Caption"
diff --git a/TripKitAndroidUI/src/main/res/layout/layout_road_tags.xml b/TripKitAndroidUI/src/main/res/layout/layout_road_tags.xml
index 94083072c..3d58b1799 100644
--- a/TripKitAndroidUI/src/main/res/layout/layout_road_tags.xml
+++ b/TripKitAndroidUI/src/main/res/layout/layout_road_tags.xml
@@ -12,7 +12,7 @@
             android:id="@+id/chartRoadTags"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@android:color/white"
+            android:background="@color/white"
             android:minHeight="300dp"
             android:visibility="gone"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/TripKitAndroidUI/src/main/res/layout/location_search.xml b/TripKitAndroidUI/src/main/res/layout/location_search.xml
index fe6a8c157..5fb3ef3f8 100644
--- a/TripKitAndroidUI/src/main/res/layout/location_search.xml
+++ b/TripKitAndroidUI/src/main/res/layout/location_search.xml
@@ -14,7 +14,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#ffffff"
+        android:background="@color/white"
         android:orientation="vertical">
 
         <include
@@ -75,7 +75,8 @@
                     android:paddingLeft="@dimen/content_padding"
                     android:paddingTop="@dimen/half_content_padding"
                     android:paddingBottom="@dimen/half_content_padding"
-                    android:src="@drawable/ic_googleresult" />
+                    android:src="@drawable/ic_googleresult"
+                    app:tint="@android:color/white" />
 
                 <ImageView
                     android:layout_width="wrap_content"
diff --git a/TripKitAndroidUI/src/main/res/layout/location_search_error.xml b/TripKitAndroidUI/src/main/res/layout/location_search_error.xml
index 174baac3d..ced9cea61 100644
--- a/TripKitAndroidUI/src/main/res/layout/location_search_error.xml
+++ b/TripKitAndroidUI/src/main/res/layout/location_search_error.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout 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">
 
     <data>
@@ -26,6 +27,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@{viewModel.iconSrc}"
+            app:tint="@color/icon_tint_default"
             tools:src="@drawable/ic_noconnection_big" />
 
         <TextView
@@ -49,7 +51,7 @@
             android:layout_height="wrap_content"
             android:onClick="@{() -> viewModel.performAction()}"
             android:text="@{viewModel.actionText}"
-            android:textColor="#23b15e"
+            android:textColor="@color/colorPrimary"
             android:visibility="gone"
             tools:text="Action Text" />
     </LinearLayout>
diff --git a/TripKitAndroidUI/src/main/res/layout/location_search_input_box.xml b/TripKitAndroidUI/src/main/res/layout/location_search_input_box.xml
index 765afdb87..50c87bc1d 100644
--- a/TripKitAndroidUI/src/main/res/layout/location_search_input_box.xml
+++ b/TripKitAndroidUI/src/main/res/layout/location_search_input_box.xml
@@ -22,7 +22,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/spacing_small"
-            app:cardBackgroundColor="@android:color/white"
+            app:cardBackgroundColor="@color/white"
             app:cardElevation="0dp">
 
             <RelativeLayout
diff --git a/TripKitAndroidUI/src/main/res/layout/map_pin_info_window.xml b/TripKitAndroidUI/src/main/res/layout/map_pin_info_window.xml
index 6280e323d..08b35c52f 100644
--- a/TripKitAndroidUI/src/main/res/layout/map_pin_info_window.xml
+++ b/TripKitAndroidUI/src/main/res/layout/map_pin_info_window.xml
@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@android:color/white"
     android:foreground="?selectableItemBackground"
     android:padding="8dp">
 
@@ -12,6 +11,7 @@
         android:id="@+id/txtTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textColor="@android:color/black"
         android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -22,6 +22,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/available_bikes"
+        android:textColor="@android:color/black"
         android:textAppearance="@style/TextAppearance.AppCompat.Caption"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@id/txtTitle"
diff --git a/TripKitAndroidUI/src/main/res/layout/map_settings_button.xml b/TripKitAndroidUI/src/main/res/layout/map_settings_button.xml
index 0241802ed..4c9268e20 100644
--- a/TripKitAndroidUI/src/main/res/layout/map_settings_button.xml
+++ b/TripKitAndroidUI/src/main/res/layout/map_settings_button.xml
@@ -4,7 +4,7 @@
     android:layout_height="40dp"
     android:layout_gravity="top|end"
     android:layout_margin="16dp"
-    app:backgroundTint="@android:color/white"
+    app:backgroundTint="@color/white"
     app:iconTint="@color/black"
     style="@style/Widget.MaterialComponents.Button.Icon"
     app:icon="@drawable/ic_person"
diff --git a/TripKitAndroidUI/src/main/res/layout/poi_details_fragment.xml b/TripKitAndroidUI/src/main/res/layout/poi_details_fragment.xml
index bda7f7eba..40e7e2b27 100644
--- a/TripKitAndroidUI/src/main/res/layout/poi_details_fragment.xml
+++ b/TripKitAndroidUI/src/main/res/layout/poi_details_fragment.xml
@@ -17,7 +17,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#ffffff">
+        android:background="@color/white">
 
         <TextView
             android:id="@+id/title"
@@ -151,7 +151,7 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_marginStart="16dp"
-            android:tint="@color/tripKitSuccess"
+            app:tint="@color/tripKitSuccess"
             android:visibility="@{viewModel.showWebsite}"
             app:layout_constraintBottom_toBottomOf="@+id/website"
             app:layout_constraintStart_toStartOf="parent"
@@ -181,7 +181,7 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_marginStart="16dp"
-            android:tint="@color/tripKitSuccess"
+            app:tint="@color/tripKitSuccess"
             android:visibility="@{viewModel.showWhat3words}"
             app:layout_constraintBottom_toBottomOf="@+id/what3word"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/TripKitAndroidUI/src/main/res/layout/route_input.xml b/TripKitAndroidUI/src/main/res/layout/route_input.xml
index 8e593d914..04bb7d4fb 100644
--- a/TripKitAndroidUI/src/main/res/layout/route_input.xml
+++ b/TripKitAndroidUI/src/main/res/layout/route_input.xml
@@ -32,7 +32,7 @@
             android:layout_width="14dp"
             android:layout_height="14dp"
             android:src="@drawable/ic_navigation_45"
-            android:tint="@color/tripKitPrimary"
+            app:tint="@color/tripKitPrimary"
             app:layout_constraintBottom_toBottomOf="@+id/startEdit"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/startEdit" />
@@ -42,7 +42,7 @@
             android:layout_width="14dp"
             android:layout_height="14dp"
             android:src="@drawable/dots_vertical"
-            android:tint="@color/black4"
+            app:tint="@color/black4"
             app:layout_constraintBottom_toBottomOf="@+id/swap"
             app:layout_constraintEnd_toEndOf="@+id/navigationIcon"
             app:layout_constraintStart_toStartOf="@+id/navigationIcon"
@@ -52,7 +52,7 @@
             android:layout_width="10dp"
             android:layout_height="10dp"
             android:src="@drawable/small_circle"
-            android:tint="@color/black4"
+            app:tint="@color/black4"
             app:layout_constraintBottom_toBottomOf="@+id/destEdit"
             app:layout_constraintEnd_toEndOf="@+id/dots"
             app:layout_constraintStart_toStartOf="@+id/dots"
diff --git a/TripKitAndroidUI/src/main/res/layout/service_detail_fragment.xml b/TripKitAndroidUI/src/main/res/layout/service_detail_fragment.xml
index e638bfa62..3e50896ba 100644
--- a/TripKitAndroidUI/src/main/res/layout/service_detail_fragment.xml
+++ b/TripKitAndroidUI/src/main/res/layout/service_detail_fragment.xml
@@ -18,7 +18,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#ffffff">
+        android:background="@color/white">
 
         <TextView
             android:id="@+id/stopName"
@@ -59,9 +59,9 @@
                 android:id="@+id/serviceType"
                 android:layout_width="16dp"
                 android:layout_height="16dp"
-                android:tint="@color/black2"
                 android:visibility="@{viewModel.modeInfo != null}"
-                app:srcCompat="@{viewModel.modeInfo}" />
+                app:srcCompat="@{viewModel.modeInfo}"
+                app:tint="@color/black2" />
 
             <androidx.cardview.widget.CardView
                 android:layout_width="wrap_content"
diff --git a/TripKitAndroidUI/src/main/res/layout/service_detail_fragment_content.xml b/TripKitAndroidUI/src/main/res/layout/service_detail_fragment_content.xml
index e3a3df2a7..a9ba6fcbc 100644
--- a/TripKitAndroidUI/src/main/res/layout/service_detail_fragment_content.xml
+++ b/TripKitAndroidUI/src/main/res/layout/service_detail_fragment_content.xml
@@ -51,10 +51,10 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="8dp"
                 android:src="@{viewModel.wheelchairIcon}"
-                android:tint="@color/black2"
                 android:visibility="@{viewModel.showWheelchairAccessible}"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
+                app:tint="@color/black2"
                 tools:src="@drawable/ic_wheelchair" />
 
             <TextView
@@ -77,7 +77,8 @@
                 android:src="@drawable/ic_bike"
                 android:visibility="@{viewModel.showBicycleAccessible}"
                 app:layout_constraintStart_toEndOf="@id/wheelchair"
-                app:layout_constraintTop_toTopOf="@id/wheelchair" />
+                app:layout_constraintTop_toTopOf="@id/wheelchair"
+                app:tint="@color/black2" />
 
             <TextView
                 android:id="@+id/tvBicycleLabel"
diff --git a/TripKitAndroidUI/src/main/res/layout/timetable_fragment.xml b/TripKitAndroidUI/src/main/res/layout/timetable_fragment.xml
index a6bbd5cbf..359c3d893 100644
--- a/TripKitAndroidUI/src/main/res/layout/timetable_fragment.xml
+++ b/TripKitAndroidUI/src/main/res/layout/timetable_fragment.xml
@@ -17,7 +17,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@android:color/white"
+        android:background="@color/white"
         tools:context=".timetables.TimetableFragment">
 
         <TextView
diff --git a/TripKitAndroidUI/src/main/res/layout/timetable_fragment_list_item.xml b/TripKitAndroidUI/src/main/res/layout/timetable_fragment_list_item.xml
index efdd2e4cc..be1b0aecb 100644
--- a/TripKitAndroidUI/src/main/res/layout/timetable_fragment_list_item.xml
+++ b/TripKitAndroidUI/src/main/res/layout/timetable_fragment_list_item.xml
@@ -45,8 +45,8 @@
                     android:id="@+id/serviceType"
                     android:layout_width="16dp"
                     android:layout_height="16dp"
-                    android:tint="@color/black2"
-                    app:srcCompat="@{viewModel.modeInfo}" />
+                    app:srcCompat="@{viewModel.modeInfo}"
+                    app:tint="@color/black2" />
 
                 <androidx.cardview.widget.CardView
                     android:layout_width="wrap_content"
@@ -75,9 +75,9 @@
                     android:layout_width="16dp"
                     android:layout_height="16dp"
                     android:layout_marginStart="4dp"
-                    android:tint="@color/tripKitWarning"
                     android:visibility="@{viewModel.serviceAlertViewModel.hasAlerts}"
-                    app:srcCompat="@drawable/ic_action_warning" />
+                    app:srcCompat="@drawable/ic_action_warning"
+                    app:tint="@color/tripKitWarning" />
 
                 <ImageView
                     android:id="@+id/wheelchair"
@@ -86,8 +86,8 @@
                     android:layout_marginStart="@dimen/spacing_extra_small"
                     android:layout_marginEnd="@dimen/spacing_xx_small"
                     android:src="@{viewModel.wheelchairIcon}"
-                    android:tint="@{viewModel.wheelchairTint}"
-                    app:addRtlSupport="@{true}" />
+                    app:addRtlSupport="@{true}"
+                    app:tint="@{viewModel.wheelchairTint}" />
 
                 <ImageView
                     android:id="@+id/ivBicycle"
diff --git a/TripKitAndroidUI/src/main/res/layout/timetable_search_set_time.xml b/TripKitAndroidUI/src/main/res/layout/timetable_search_set_time.xml
index 43cdaf9c5..3c57843f2 100644
--- a/TripKitAndroidUI/src/main/res/layout/timetable_search_set_time.xml
+++ b/TripKitAndroidUI/src/main/res/layout/timetable_search_set_time.xml
@@ -22,7 +22,8 @@
             android:padding="8dp"
             android:background="@android:color/transparent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+            app:layout_constraintEnd_toEndOf="parent"
+            app:tint="@color/black" />
 
         <EditText
             android:layout_width="0dp"
@@ -34,6 +35,7 @@
             android:singleLine="true"
             android:layout_marginTop="4dp"
             android:drawableStart="@drawable/ic_search"
+            android:drawableTint="@color/black"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/timeSet"
diff --git a/TripKitAndroidUI/src/main/res/layout/train_item.xml b/TripKitAndroidUI/src/main/res/layout/train_item.xml
index b957402a3..7e73daa88 100644
--- a/TripKitAndroidUI/src/main/res/layout/train_item.xml
+++ b/TripKitAndroidUI/src/main/res/layout/train_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
 
@@ -15,6 +16,6 @@
         android:scaleType="fitXY"
         android:paddingRight="2dp"
         android:src="@{occupancy.imageDrawable}"
-        android:tint="@{occupancy.imageTintColor}" />
+        app:tint="@{occupancy.imageTintColor}" />
 
 </layout>
\ No newline at end of file
diff --git a/TripKitAndroidUI/src/main/res/layout/trip_preview_external_action_pager_list_item.xml b/TripKitAndroidUI/src/main/res/layout/trip_preview_external_action_pager_list_item.xml
index 66a8ffa55..952243b01 100644
--- a/TripKitAndroidUI/src/main/res/layout/trip_preview_external_action_pager_list_item.xml
+++ b/TripKitAndroidUI/src/main/res/layout/trip_preview_external_action_pager_list_item.xml
@@ -45,14 +45,13 @@
             android:layout_height="@dimen/map_icon_size"
             android:layout_marginStart="@dimen/spacing_small"
             android:src="@{viewModel.externalAction.drawable}"
-            android:tint="@android:color/black"
             android:visibility="@{parentViewModel.enableActionButtons? View.VISIBLE: View.INVISIBLE}"
             app:layout_constraintBottom_toBottomOf="@+id/tvAction"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/tvAction"
-            app:tint="@android:color/black"
+            app:tint="@color/black"
             tools:elevation="10dp"
-            tools:ignore="ContentDescription,UseAppTint"
+            tools:ignore="ContentDescription"
             tools:src="@drawable/ic_go" />
 
         <TextView
diff --git a/TripKitAndroidUI/src/main/res/layout/trip_preview_pager.xml b/TripKitAndroidUI/src/main/res/layout/trip_preview_pager.xml
index a7a9a5b2f..419fe51a0 100644
--- a/TripKitAndroidUI/src/main/res/layout/trip_preview_pager.xml
+++ b/TripKitAndroidUI/src/main/res/layout/trip_preview_pager.xml
@@ -17,7 +17,7 @@
                 android:id="@+id/tripSegmentPager"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@android:color/white"
+                android:background="@color/white"
                 android:focusable="false"
                 android:importantForAccessibility="no" />
         </FrameLayout>
diff --git a/TripKitAndroidUI/src/main/res/layout/trip_preview_pager_item_header.xml b/TripKitAndroidUI/src/main/res/layout/trip_preview_pager_item_header.xml
index 45048c4cd..2117d1b6c 100644
--- a/TripKitAndroidUI/src/main/res/layout/trip_preview_pager_item_header.xml
+++ b/TripKitAndroidUI/src/main/res/layout/trip_preview_pager_item_header.xml
@@ -19,6 +19,7 @@
             android:layout_marginTop="@dimen/spacing_normal"
             android:layout_marginStart="16dp"
             android:src="@{viewModel.icon}"
+            app:tint="@color/black"
             app:layout_constraintBottom_toBottomOf="@+id/textBarrier"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/TripKitAndroidUI/src/main/res/layout/trip_preview_pager_mode_location_item.xml b/TripKitAndroidUI/src/main/res/layout/trip_preview_pager_mode_location_item.xml
index 2d6a97897..dcef5ae6d 100644
--- a/TripKitAndroidUI/src/main/res/layout/trip_preview_pager_mode_location_item.xml
+++ b/TripKitAndroidUI/src/main/res/layout/trip_preview_pager_mode_location_item.xml
@@ -114,16 +114,17 @@
             app:layout_constraintStart_toStartOf="@+id/divider"
             app:layout_constraintTop_toBottomOf="@+id/divider" />
 
-        <ImageView
-            android:id="@+id/addressIcon"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="40dp"
-            android:visibility="@{viewModel.showAddress}"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/infoGroupRecyclerView"
-            app:srcCompat="@drawable/ic_pin" />
+            <ImageView
+                android:id="@+id/addressIcon"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="40dp"
+                android:visibility="@{viewModel.showAddress}"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/infoGroupRecyclerView"
+                app:srcCompat="@drawable/ic_pin"
+                app:tint="@color/icon_tint_default" />
 
         <TextView
             android:id="@+id/address"
@@ -141,17 +142,17 @@
             app:layout_constraintTop_toTopOf="@+id/addressIcon"
             tools:text="Address Address Address Address Address Address Address" />
 
-        <ImageView
-            android:id="@+id/websiteIcon"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="24dp"
-            android:tint="@color/tripKitSuccess"
-            android:visibility="@{viewModel.showWebsite}"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/addressIcon"
-            app:srcCompat="@drawable/ic_globe" />
+            <ImageView
+                android:id="@+id/websiteIcon"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="24dp"
+                android:visibility="@{viewModel.showWebsite}"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/addressIcon"
+                app:srcCompat="@drawable/ic_globe"
+                app:tint="@color/tripKitSuccess" />
 
         <TextView
             android:id="@+id/website"
@@ -171,17 +172,17 @@
             app:layout_constraintTop_toTopOf="@+id/websiteIcon"
             tools:text="www.somesite" />
 
-        <ImageView
-            android:id="@+id/what3wordIcon"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="24dp"
-            android:tint="@color/tripKitSuccess"
-            android:visibility="@{viewModel.showWhat3words}"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/websiteIcon"
-            app:srcCompat="@drawable/ic_what3word" />
+            <ImageView
+                android:id="@+id/what3wordIcon"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="24dp"
+                android:visibility="@{viewModel.showWhat3words}"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/websiteIcon"
+                app:srcCompat="@drawable/ic_what3word"
+                app:tint="@color/tripKitSuccess" />
 
         <TextView
             android:id="@+id/what3word"
diff --git a/TripKitAndroidUI/src/main/res/layout/trip_preview_pager_nearby_info_group_item.xml b/TripKitAndroidUI/src/main/res/layout/trip_preview_pager_nearby_info_group_item.xml
index ddf5e3c9a..73a135383 100644
--- a/TripKitAndroidUI/src/main/res/layout/trip_preview_pager_nearby_info_group_item.xml
+++ b/TripKitAndroidUI/src/main/res/layout/trip_preview_pager_nearby_info_group_item.xml
@@ -44,7 +44,8 @@
                 android:id="@+id/icon"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:src="@{viewModel.icon}" />
+                android:src="@{viewModel.icon}"
+                app:tint="@color/icon_tint_default" />
 
             <TextView
                 android:id="@+id/description"
diff --git a/TripKitAndroidUI/src/main/res/layout/trip_preview_pager_nearby_item.xml b/TripKitAndroidUI/src/main/res/layout/trip_preview_pager_nearby_item.xml
index 283635403..7a94a3879 100644
--- a/TripKitAndroidUI/src/main/res/layout/trip_preview_pager_nearby_item.xml
+++ b/TripKitAndroidUI/src/main/res/layout/trip_preview_pager_nearby_item.xml
@@ -28,7 +28,7 @@
             android:id="@+id/transportItemsView"
             app:itemBinding="@{viewModel.transportBinding}"
             app:items="@{viewModel.transportModes}"
-            android:background="#f5f6f7"
+            android:background="@color/grey2"
             android:layout_marginTop="32dp"
             android:visibility="@{viewModel.showModes}"
             android:paddingStart="16dp"
diff --git a/TripKitAndroidUI/src/main/res/layout/trip_preview_pager_nearby_list_item.xml b/TripKitAndroidUI/src/main/res/layout/trip_preview_pager_nearby_list_item.xml
index 64c998ef2..09e9133e1 100644
--- a/TripKitAndroidUI/src/main/res/layout/trip_preview_pager_nearby_list_item.xml
+++ b/TripKitAndroidUI/src/main/res/layout/trip_preview_pager_nearby_list_item.xml
@@ -22,7 +22,8 @@
             android:src="@{viewModel.icon}"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent" />
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:tint="@color/icon_tint_default" />
 
         <TextView
             android:layout_width="0dp"
diff --git a/TripKitAndroidUI/src/main/res/layout/trip_preview_pager_nearby_list_mode_transport.xml b/TripKitAndroidUI/src/main/res/layout/trip_preview_pager_nearby_list_mode_transport.xml
index 04f24cfb5..96fcb1072 100644
--- a/TripKitAndroidUI/src/main/res/layout/trip_preview_pager_nearby_list_mode_transport.xml
+++ b/TripKitAndroidUI/src/main/res/layout/trip_preview_pager_nearby_list_mode_transport.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
 
@@ -17,6 +18,7 @@
         android:background="@drawable/trip_result_transport_mode_selector_background"
         android:src="@{viewModel.modeIconId}"
         android:onClick="@{viewModel::onItemClick}"
-        android:checked="@{viewModel.checked}" />
+        android:checked="@{viewModel.checked}"
+        app:tint="@color/black" />
 
 </layout>
\ No newline at end of file
diff --git a/TripKitAndroidUI/src/main/res/layout/trip_preview_service_item.xml b/TripKitAndroidUI/src/main/res/layout/trip_preview_service_item.xml
index 9d3a27844..85d4373ef 100644
--- a/TripKitAndroidUI/src/main/res/layout/trip_preview_service_item.xml
+++ b/TripKitAndroidUI/src/main/res/layout/trip_preview_service_item.xml
@@ -14,7 +14,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@android:color/white">
+        android:background="@color/white">
 
         <TextView
             android:id="@+id/stopName"
@@ -123,10 +123,10 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="8dp"
                 android:src="@{viewModel.wheelchairIcon}"
-                android:tint="@color/black2"
                 android:visibility="@{viewModel.showWheelchairAccessible}"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
+                app:tint="@color/black2"
                 tools:src="@drawable/ic_wheelchair" />
 
             <TextView
@@ -149,7 +149,8 @@
                 android:src="@drawable/ic_bike"
                 android:visibility="@{viewModel.showBicycleAccessible}"
                 app:layout_constraintStart_toEndOf="@id/wheelchair"
-                app:layout_constraintTop_toTopOf="@id/wheelchair" />
+                app:layout_constraintTop_toTopOf="@id/wheelchair"
+                app:tint="@color/black2" />
 
             <TextView
                 android:id="@+id/tvBicycleLabel"
diff --git a/TripKitAndroidUI/src/main/res/layout/trip_preview_step.xml b/TripKitAndroidUI/src/main/res/layout/trip_preview_step.xml
index 85a801f13..22074ff54 100644
--- a/TripKitAndroidUI/src/main/res/layout/trip_preview_step.xml
+++ b/TripKitAndroidUI/src/main/res/layout/trip_preview_step.xml
@@ -31,6 +31,7 @@
             app:layout_constraintBottom_toBottomOf="@+id/description"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
+            app:tint="@color/icon_tint_default"
             tools:src="@drawable/maneuver_light_left" />
 
         <TextView
diff --git a/TripKitAndroidUI/src/main/res/layout/trip_result_list_fragment.xml b/TripKitAndroidUI/src/main/res/layout/trip_result_list_fragment.xml
index 146aa4978..91ec41852 100644
--- a/TripKitAndroidUI/src/main/res/layout/trip_result_list_fragment.xml
+++ b/TripKitAndroidUI/src/main/res/layout/trip_result_list_fragment.xml
@@ -22,7 +22,7 @@
             android:layout_height="wrap_content"
             android:paddingTop="@dimen/spacing_small"
             android:focusable="true"
-            android:background="@android:color/white"
+            android:background="@color/white"
             android:importantForAccessibility="yes"
             android:contentDescription="@{viewModel.toContentDescription + viewModel.fromContentDescription}"
             app:layout_constraintStart_toStartOf="parent"
@@ -107,11 +107,11 @@
                 android:paddingBottom="@dimen/spacing_extra_small"
                 android:onClick="@{() -> viewModel.onStartLocationClicked()}"
                 android:layout_marginEnd="12dp"
-                android:tint="@color/colorPrimary"
                 app:layout_constraintBottom_toBottomOf="@id/from"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="@+id/from"
-                app:srcCompat="@drawable/chevron_right" />
+                app:srcCompat="@drawable/chevron_right"
+                app:tint="@color/colorPrimary" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <!-- Leave Now & Transports header -->
@@ -122,7 +122,7 @@
             android:paddingTop="@dimen/spacing_large"
             android:paddingBottom="@dimen/spacing_small"
             android:paddingHorizontal="@dimen/spacing_small"
-            android:background="@android:color/white"
+            android:background="@color/white"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/clLocations">
@@ -216,7 +216,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="@dimen/content_padding"
-            android:background="@android:color/white"
+            android:background="@color/white"
             android:layout_marginTop="@dimen/spacing_extra_small"
             android:focusable="true"
             android:clickable="true"
diff --git a/TripKitAndroidUI/src/main/res/layout/trip_result_list_item.xml b/TripKitAndroidUI/src/main/res/layout/trip_result_list_item.xml
index 87cbd449f..70e27ed83 100644
--- a/TripKitAndroidUI/src/main/res/layout/trip_result_list_item.xml
+++ b/TripKitAndroidUI/src/main/res/layout/trip_result_list_item.xml
@@ -44,6 +44,7 @@
                     android:layout_marginBottom="10dp"
                     android:layoutDirection="ltr"
                     android:src="@{viewModel.badgeDrawable}"
+                    app:tint="@color/icon_tint_default"
                     android:visibility="@{viewModel.badgeVisible}"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
diff --git a/TripKitAndroidUI/src/main/res/layout/trip_result_pager.xml b/TripKitAndroidUI/src/main/res/layout/trip_result_pager.xml
index b8a1a3361..1f7d76e4a 100644
--- a/TripKitAndroidUI/src/main/res/layout/trip_result_pager.xml
+++ b/TripKitAndroidUI/src/main/res/layout/trip_result_pager.xml
@@ -17,7 +17,7 @@
             android:id="@+id/tripGroupsPager"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@android:color/white"
+            android:background="@color/white"
             app:currentItem="@{viewModel.currentPage}" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/TripKitAndroidUI/src/main/res/layout/trip_result_segment_item.xml b/TripKitAndroidUI/src/main/res/layout/trip_result_segment_item.xml
index 2b34bf28e..4cfb4f720 100644
--- a/TripKitAndroidUI/src/main/res/layout/trip_result_segment_item.xml
+++ b/TripKitAndroidUI/src/main/res/layout/trip_result_segment_item.xml
@@ -86,6 +86,7 @@
             android:layoutDirection="locale"
             android:rotation="45"
             android:src="@drawable/ic_wifi"
+            app:tint="@color/icon_tint_default"
             android:visibility="@{viewModel.isRealtime()}"
             app:isDisabled="@{viewModel.isCancelled()}"
             app:layout_constraintBottom_toBottomOf="@+id/secondary"
@@ -97,6 +98,7 @@
             android:layoutDirection="locale"
             android:layout_marginStart="@dimen/spacing_extra_small"
             android:src="@drawable/ic_bike"
+            app:tint="@color/icon_tint_default"
             android:visibility="@{viewModel.isBicycleAccessible()}"
             app:isDisabled="@{viewModel.isCancelled()}"
             app:layout_constraintBottom_toBottomOf="@+id/secondary"
diff --git a/TripKitAndroidUI/src/main/res/layout/trip_segment.xml b/TripKitAndroidUI/src/main/res/layout/trip_segment.xml
index b843a2bfc..3ec64cfd1 100644
--- a/TripKitAndroidUI/src/main/res/layout/trip_segment.xml
+++ b/TripKitAndroidUI/src/main/res/layout/trip_segment.xml
@@ -14,7 +14,7 @@
         android:id="@+id/layoutDetails"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@android:color/white"
+        android:background="@color/white"
         android:onClick="@{() -> viewModel.onClick.perform()}"
         android:paddingStart="16dp"
         app:layout_constraintTop_toTopOf="parent">
@@ -63,7 +63,7 @@
             android:layout_width="@dimen/segment_item_icon_background_size"
             android:layout_height="@dimen/segment_item_icon_background_size"
             android:src="@drawable/black_circle"
-            android:tint="@{viewModel.backgroundCircleTint}"
+            app:tint="@{viewModel.backgroundCircleTint}"
             android:visibility="@{viewModel.showBackgroundCircle}"
             app:layout_constraintBottom_toBottomOf="@+id/line"
             app:layout_constraintEnd_toStartOf="@+id/leftGuide"
@@ -122,6 +122,7 @@
                 android:layout_height="@dimen/segment_item_icon_size"
                 android:layoutDirection="ltr"
                 android:src="@{viewModel.icon}"
+                app:tint="@android:color/white"
                 tools:src="@drawable/ic_train"
                 tools:tint="@android:color/white" />
         </LinearLayout>
diff --git a/TripKitAndroidUI/src/main/res/layout/trip_segment_alert_details_bottom_sheet.xml b/TripKitAndroidUI/src/main/res/layout/trip_segment_alert_details_bottom_sheet.xml
index 73bda8686..8398d52a4 100644
--- a/TripKitAndroidUI/src/main/res/layout/trip_segment_alert_details_bottom_sheet.xml
+++ b/TripKitAndroidUI/src/main/res/layout/trip_segment_alert_details_bottom_sheet.xml
@@ -30,6 +30,7 @@
             android:layout_height="24dp"
             android:id="@+id/closeButton"
             android:src="@drawable/close"
+            app:tint="@color/icon_tint_default"
             android:contentDescription="@string/desc_close"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:layout_marginEnd="16dp"
diff --git a/TripKitAndroidUI/src/main/res/layout/trip_segment_alert_details_item.xml b/TripKitAndroidUI/src/main/res/layout/trip_segment_alert_details_item.xml
index 94fee5112..28aa7d9bd 100644
--- a/TripKitAndroidUI/src/main/res/layout/trip_segment_alert_details_item.xml
+++ b/TripKitAndroidUI/src/main/res/layout/trip_segment_alert_details_item.xml
@@ -20,7 +20,7 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:src="@drawable/ic_action_warning"
-            android:tint="@color/tripKitWarning"
+            app:tint="@color/tripKitWarning"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/TripKitAndroidUI/src/main/res/layout/trip_segment_list_fragment.xml b/TripKitAndroidUI/src/main/res/layout/trip_segment_list_fragment.xml
index de381a886..710e2fb08 100644
--- a/TripKitAndroidUI/src/main/res/layout/trip_segment_list_fragment.xml
+++ b/TripKitAndroidUI/src/main/res/layout/trip_segment_list_fragment.xml
@@ -13,7 +13,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#ffffff"
+        android:background="@color/white"
         android:focusable="false"
         android:importantForAccessibility="no">
 
@@ -42,6 +42,7 @@
             android:background="?attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/desc_close"
             android:src="@drawable/close"
+            app:tint="@color/icon_tint_default"
             android:visibility="@{viewModel.showCloseButton}"
             app:layout_constraintBottom_toBottomOf="@+id/duration"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/TripKitAndroidUI/src/main/res/layout/view_generic_list_item.xml b/TripKitAndroidUI/src/main/res/layout/view_generic_list_item.xml
index a718ebba9..97c61ad48 100644
--- a/TripKitAndroidUI/src/main/res/layout/view_generic_list_item.xml
+++ b/TripKitAndroidUI/src/main/res/layout/view_generic_list_item.xml
@@ -42,6 +42,7 @@
             android:layout_height="@dimen/icon_medium"
             android:padding="10dp"
             android:src="@drawable/ic_plain_check"
+            app:tint="@color/colorPrimary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
diff --git a/TripKitAndroidUI/src/main/res/layout/view_my_location_button.xml b/TripKitAndroidUI/src/main/res/layout/view_my_location_button.xml
index 56ef9d62f..a4ee7c171 100644
--- a/TripKitAndroidUI/src/main/res/layout/view_my_location_button.xml
+++ b/TripKitAndroidUI/src/main/res/layout/view_my_location_button.xml
@@ -5,8 +5,8 @@
     android:layout_gravity="bottom|end"
     android:layout_marginRight="16dp"
     android:layout_marginBottom="88dp"
-    app:backgroundTint="@android:color/white"
-    app:iconTint="@color/black"
+    app:backgroundTint="@color/white"
+    app:iconTint="@color/icon_tint_default"
     style="@style/Widget.MaterialComponents.Button.Icon"
     app:icon="@drawable/ic_nav_my_location"
     app:iconSize="22dp"
diff --git a/TripKitAndroidUI/src/main/res/layout/view_simple_callout.xml b/TripKitAndroidUI/src/main/res/layout/view_simple_callout.xml
index ebc1fa5c9..d46c5fe6e 100644
--- a/TripKitAndroidUI/src/main/res/layout/view_simple_callout.xml
+++ b/TripKitAndroidUI/src/main/res/layout/view_simple_callout.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.skedgo.tripkit.ui.map.SimpleCalloutView 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:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:gravity="center_vertical">
+    android:gravity="center_vertical"
+    android:padding="8dp">
 
     <ImageView
         android:id="@+id/leftImageView"
@@ -26,7 +28,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="marquee"
             android:maxLines="2"
-            android:textColor="@color/v4_title_text"
+            android:textColor="@android:color/black"
             android:textSize="16sp"
             tools:text="2:07pm" />
 
@@ -36,6 +38,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="marquee"
             android:singleLine="true"
+            android:textColor="@android:color/darker_gray"
             android:textSize="14sp"
             tools:text="Awesome place" />
     </LinearLayout>
diff --git a/TripKitAndroidUI/src/main/res/layout/viewholder_generic_list.xml b/TripKitAndroidUI/src/main/res/layout/viewholder_generic_list.xml
index 264a19746..66e98e2c8 100644
--- a/TripKitAndroidUI/src/main/res/layout/viewholder_generic_list.xml
+++ b/TripKitAndroidUI/src/main/res/layout/viewholder_generic_list.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <FrameLayout
         android:layout_width="match_parent"
@@ -25,6 +26,7 @@
                 android:layout_height="match_parent"
                 android:padding="10dp"
                 android:src="@drawable/ic_plain_check"
+                app:tint="@color/black"
                 android:visibility="@{isChecked}" />
         </LinearLayout>
 
diff --git a/TripKitAndroidUI/src/main/res/raw-night/map_style.json b/TripKitAndroidUI/src/main/res/raw-night/map_style.json
new file mode 100644
index 000000000..c5e0146ad
--- /dev/null
+++ b/TripKitAndroidUI/src/main/res/raw-night/map_style.json
@@ -0,0 +1,126 @@
+[
+    {
+        "featureType": "transit",
+        "elementType": "labels.icon",
+        "stylers": [
+            {
+                "visibility": "off"
+            }
+        ]
+    },
+    {
+        "featureType": "all",
+        "elementType": "geometry",
+        "stylers": [
+            {
+                "color": "#242f3e"
+            }
+        ]
+    },
+    {
+        "featureType": "water",
+        "elementType": "geometry",
+        "stylers": [
+            {
+                "color": "#17263c"
+            }
+        ]
+    },
+    {
+        "featureType": "landscape",
+        "elementType": "geometry",
+        "stylers": [
+            {
+                "color": "#2a3f57"
+            }
+        ]
+    },
+    {
+        "featureType": "road.highway",
+        "elementType": "geometry",
+        "stylers": [
+            {
+                "color": "#3f546e"
+            }
+        ]
+    },
+    {
+        "featureType": "road.arterial",
+        "elementType": "geometry",
+        "stylers": [
+            {
+                "color": "#4a5f7a"
+            }
+        ]
+    },
+    {
+        "featureType": "road.local",
+        "elementType": "geometry",
+        "stylers": [
+            {
+                "color": "#5a6f8a"
+            }
+        ]
+    },
+    {
+        "featureType": "all",
+        "elementType": "labels.text.fill",
+        "stylers": [
+            {
+                "color": "#b0c4de"
+            },
+            {
+                "lightness": 40
+            }
+        ]
+    },
+    {
+        "featureType": "all",
+        "elementType": "labels.text.stroke",
+        "stylers": [
+            {
+                "color": "#1a2332"
+            },
+            {
+                "lightness": 16
+            }
+        ]
+    },
+    {
+        "featureType": "poi",
+        "elementType": "geometry",
+        "stylers": [
+            {
+                "color": "#2a3f57"
+            }
+        ]
+    },
+    {
+        "featureType": "poi",
+        "elementType": "labels.text.fill",
+        "stylers": [
+            {
+                "color": "#b0c4de"
+            }
+        ]
+    },
+    {
+        "featureType": "administrative",
+        "elementType": "geometry",
+        "stylers": [
+            {
+                "color": "#2a3f57"
+            }
+        ]
+    },
+    {
+        "featureType": "administrative",
+        "elementType": "labels.text.fill",
+        "stylers": [
+            {
+                "color": "#b0c4de"
+            }
+        ]
+    }
+]
+
diff --git a/TripKitAndroidUI/src/main/res/values-night/colors.xml b/TripKitAndroidUI/src/main/res/values-night/colors.xml
new file mode 100644
index 000000000..8e490cc10
--- /dev/null
+++ b/TripKitAndroidUI/src/main/res/values-night/colors.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#2ECC71</color>
+    <color name="colorPrimaryDark">#0C6C58</color>
+    <color name="colorAccent">#5FAFFF</color>
+    <color name="colorAccent20">#332B7EED</color>
+    <color name="colorAccent50">#802B7EED</color>
+
+    <!-- "New" colors from design mockups-->
+    <color name="tripKitPrimary">#23b15e</color>
+    <color name="white">#212A33</color>
+    <color name="black">#FFFFFF</color>
+    <color name="black1">#99FFFFFF</color>
+    <color name="black2">#4DFFFFFF</color>
+    <color name="black3">#2EFFFFFF</color>
+    <color name="black4">#1FFFFFFF</color>
+    <color name="grey1">#2B3A40</color>
+    <color name="grey2">#303840</color>
+    <color name="grey3">#353D45</color>
+    <color name="grey4">#3A444C</color>
+    <color name="tripKitSuccess">#30A548</color>
+    <color name="tripKitWarning">#E8AA27</color>
+    <color name="tripKitError">#D73737</color>
+    <color name="tripKitWarning60">#99E8AA27</color>
+    <color name="tripKitWarning12">#1FE8AA27</color>
+    <color name="tripKitDivider">#1FFFFFFF</color>
+    <color name="classification_easiest">#23b15e</color>
+    <color name="classification_cheapest">#ff8d1b</color>
+    <color name="classification_fastest">#f5a300</color>
+    <color name="classification_greenest">#00a88f</color>
+    <color name="classification_healthiest">#e15b72</color>
+    <color name="classification_recommended">#1880e7</color>
+
+    <!-- "DayNight" colors -->
+<!--    <color name="inactiveAreaBackground">#1C1C1E</color>-->
+<!--    <color name="searchBarBackground">#353535</color>-->
+    <color name="inactiveAreaBackground">#303840</color>
+    <color name="searchBarBackground">#2A2F35</color>
+
+    <color name="favorite_blue">#5A8BFF</color>
+    <color name="favorite_blue_faded">#305A8BFF</color>
+    <color name="favorite_bus">#1FAE65</color>
+    <color name="favorite_train">#7D7CC5</color>
+    <color name="favorite_subway">#B26CB3</color>
+    <color name="favorite_monorail">#D4B815</color>
+    <color name="favorite_school_bus">#D4C815</color>
+    <color name="favorite_coach">#589FFF</color>
+    <color name="favorite_tram">#D89040</color>
+    <color name="favorite_cablecar">#C44D3F</color>
+    <color name="favorite_ferry">#5EABE0</color>
+
+    <!-- Colors imported from TripGo -->
+    <color name="main_color">#23b15e</color>
+    <color name="time_label_bg">#CC212A33</color>
+
+    <color name="divider">#3C4A59</color>
+    <color name="light_grey_2">#999999</color>
+    <color name="light_grey_3">#AAAAAA</color>
+
+    <color name="title_text">#FFFFFF</color>
+    <color name="description_text">#CCCCCC</color>
+
+    <color name="occupancyManySeats">#23B15E</color>
+    <color name="occupancyFewSeats">#FFB500</color>
+    <color name="occupancyStandingOnly">#FF9600</color>
+    <color name="alert">#E34040</color>
+    <color name="v4_back_to_top_stroke">#FFFFFF</color>
+    <color name="v4_back_to_top_bg">#80344E6D</color>
+
+    <color name="v4_title_text">#FFFFFF</color>
+    <color name="v4_color">#00CC66</color>
+    <color name="v4_btn_radio_off_flat">#3A3A3A</color>
+    <color name="v4_btn_radio_on_flat">#00CC66</color>
+    <color name="v4_btn_radio_pressed_flat">#00a653</color>
+    <color name="v4_btn_radio_text_flat">#A0A0A0</color>
+
+    <color name="toolbar_buttonText">#4F9DD8</color>
+    <color name="toolbar_buttonText_pressed">#4A6A8B</color>
+    <color name="toolbar_button">#303840</color>
+
+    <color name="marker_car_share">#79C5FF</color>
+
+    <color name="priority_money">#AC80F2</color>
+    <color name="priority_time">#EE9EBE</color>
+    <color name="priority_environment">#CCEBAF</color>
+    <color name="priority_convenience">#F7C1AC</color>
+    <color name="priority_exercise">#9EE2FA</color>
+
+    <color name="colorRippleGray">#1AFFFFFF</color>
+    <color name="colorMutedWhite">#2B3A40</color>
+
+    <color name="warning_late">#C47710</color>
+
+    <color name="pink1">#FF2F74</color>
+
+    <color name="textinputlayout_border">#A0A0A0</color>
+    <color name="textinputlayout_border_focused">#FFFFFF</color>
+
+    <color name="disabled">#666666</color>
+    <color name="red20">#33FF9999</color>
+
+    <color name="induction_detail_description">#99CCCCCC</color>
+    <color name="trip_line_inactive">#60A6A6A6</color>
+    
+    <!-- Icon tinting for dark mode support -->
+    <color name="icon_tint_default">#E0E0E0</color>
+    
+    <!-- Transport mode selector colors -->
+    <color name="transport_mode_selector_checked">#F5F5F5</color>
+    <color name="transport_mode_selector_unchecked">#AAFFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/TripKitAndroidUI/src/main/res/values/colors.xml b/TripKitAndroidUI/src/main/res/values/colors.xml
index 558476921..67c1e32b2 100644
--- a/TripKitAndroidUI/src/main/res/values/colors.xml
+++ b/TripKitAndroidUI/src/main/res/values/colors.xml
@@ -8,6 +8,7 @@
 
     <!-- "New" colors from design mockups-->
     <color name="tripKitPrimary">#23b15e</color>
+    <color name="white">#FFFFFF</color>
     <color name="black">#212A33</color>
     <color name="black1">#99212A33</color>
     <color name="black2">#4D212A33</color>
@@ -30,6 +31,10 @@
     <color name="classification_healthiest">#e15b72</color>
     <color name="classification_recommended">#1880e7</color>
 
+    <!-- "DayNight" colors -->
+    <color name="inactiveAreaBackground">#F6F6F6</color>
+    <color name="searchBarBackground">#FFFFFF</color>
+
     <color name="favorite_blue">#3467CE</color>
     <color name="favorite_blue_faded">#703467CE</color>
     <color name="favorite_bus">#23B15E</color>
@@ -98,4 +103,11 @@
 
     <color name="action_negative">#FB2C36</color>
     <color name="action_positive">#00C950</color>
+    
+    <!-- Icon tinting for dark mode support -->
+    <color name="icon_tint_default">#616161</color>
+    
+    <!-- Transport mode selector colors -->
+    <color name="transport_mode_selector_checked">#FFFFFF</color>
+    <color name="transport_mode_selector_unchecked">#1F212A33</color>
 </resources>
\ No newline at end of file
diff --git a/TripKitAndroidUI/src/main/res/values/styles.xml b/TripKitAndroidUI/src/main/res/values/styles.xml
index 52df82be3..6740f87a4 100644
--- a/TripKitAndroidUI/src/main/res/values/styles.xml
+++ b/TripKitAndroidUI/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <resources>
 
-    <style name="AppTheme" parent="Theme.MaterialComponents.Light" />
+    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight" />
 
     <style name="ToNowButtonStyle">
         <item name="android:layout_width">wrap_content</item>
@@ -29,7 +29,7 @@
         <item name="android:windowFrame">@null</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowBackground">@android:color/white</item>
+        <item name="android:windowBackground">@color/white</item>
     </style>
 
     <style name="FlatDialogTitleStyle">
@@ -65,13 +65,13 @@
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat" />
 
-    <style name="FullScreenDialog" parent="Theme.AppCompat.Light.Dialog">
+    <style name="FullScreenDialog" parent="Theme.AppCompat.DayNight.Dialog">
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowIsFloating">false</item>
     </style>
 
-    <style name="Widget.CalendarView.Custom" parent="Theme.MaterialComponents.Light" >
+    <style name="Widget.CalendarView.Custom" parent="Theme.MaterialComponents.DayNight" >
         <item name="android:focusedMonthDateColor">@color/description_text</item>
         <item name="colorControlActivated">@color/description_text</item>
         <item name="android:textColor">@color/black</item>
diff --git a/tripkit-android b/tripkit-android
index 018654383..04dfe0add 160000
--- a/tripkit-android
+++ b/tripkit-android
@@ -1 +1 @@
-Subproject commit 018654383a2b023373f61f5d4a49f1bf61b5d322
+Subproject commit 04dfe0addddb23e22db1e77454f41b47328357fd
diff --git a/tripkituisample/src/main/res/values/styles.xml b/tripkituisample/src/main/res/values/styles.xml
index 6edb71f8a..016d72985 100644
--- a/tripkituisample/src/main/res/values/styles.xml
+++ b/tripkituisample/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.Tripkitandroidui" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="Theme.Tripkitandroidui" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>