diff --git a/core/ui/compose/demo/src/main/java/app/k9mail/core/ui/compose/demo/MainActivity.kt b/core/ui/compose/demo/src/main/java/app/k9mail/core/ui/compose/demo/MainActivity.kt
index c7397fd416..5da332d778 100644
--- a/core/ui/compose/demo/src/main/java/app/k9mail/core/ui/compose/demo/MainActivity.kt
+++ b/core/ui/compose/demo/src/main/java/app/k9mail/core/ui/compose/demo/MainActivity.kt
@@ -3,28 +3,13 @@ package app.k9mail.core.ui.compose.demo
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         setContent {
-            Greeting(name = stringResource(id = R.string.app_name))
+            MainView()
         }
     }
 }
-
-@Composable
-fun Greeting(name: String) {
-    Text(text = "Hello $name!")
-}
-
-@Preview(showBackground = true)
-@Composable
-fun Preview() {
-    Greeting("Android")
-}
diff --git a/core/ui/compose/demo/src/main/java/app/k9mail/core/ui/compose/demo/MainView.kt b/core/ui/compose/demo/src/main/java/app/k9mail/core/ui/compose/demo/MainView.kt
new file mode 100644
index 0000000000..e3380ef10e
--- /dev/null
+++ b/core/ui/compose/demo/src/main/java/app/k9mail/core/ui/compose/demo/MainView.kt
@@ -0,0 +1,53 @@
+package app.k9mail.core.ui.compose.demo
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.tooling.preview.Preview
+import app.k9mail.core.ui.compose.theme.K9Theme
+import app.k9mail.core.ui.compose.theme.MainTheme
+import app.k9mail.core.ui.compose.theme.ThunderbirdTheme
+
+@Composable
+fun MainView() {
+    Column(
+        modifier = Modifier.fillMaxSize()
+    ) {
+        K9Theme {
+            MainContent(name = "K-9")
+        }
+        K9Theme(darkTheme = true) {
+            MainContent(name = "K-9 dark")
+        }
+        ThunderbirdTheme {
+            MainContent(name = "Thunderbird")
+        }
+        ThunderbirdTheme(darkTheme = true) {
+            MainContent(name = "Thunderbird dark")
+        }
+    }
+}
+
+@Composable
+fun MainContent(
+    name: String
+) {
+    Surface(modifier = Modifier.fillMaxWidth(), color = MainTheme.colors.background) {
+        Column {
+            Text(text = "Hello $name!")
+            Image(painter = painterResource(id = MainTheme.images.logo), contentDescription = "logo")
+        }
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun Preview() {
+    MainView()
+}
diff --git a/core/ui/compose/demo/src/main/java/app/k9mail/core/ui/compose/theme/K9Theme.kt b/core/ui/compose/demo/src/main/java/app/k9mail/core/ui/compose/theme/K9Theme.kt
new file mode 100644
index 0000000000..b0983e6194
--- /dev/null
+++ b/core/ui/compose/demo/src/main/java/app/k9mail/core/ui/compose/theme/K9Theme.kt
@@ -0,0 +1,37 @@
+package app.k9mail.core.ui.compose.theme
+
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material.darkColors
+import androidx.compose.material.lightColors
+import androidx.compose.runtime.Composable
+
+private val k9LightColorPalette = lightColors(
+    primary = material_gray_800,
+    primaryVariant = material_gray_700,
+    secondary = material_pink_500,
+    secondaryVariant = material_pink_300
+)
+
+private val k9DarkColorPalette = darkColors(
+    primary = material_gray_100,
+    primaryVariant = material_gray_50,
+    secondary = material_pink_300,
+    secondaryVariant = material_pink_500
+)
+
+@Composable
+fun K9Theme(
+    darkTheme: Boolean = isSystemInDarkTheme(),
+    content: @Composable () -> Unit
+) {
+    val images = Images(logo = app.k9mail.core.ui.compose.demo.R.drawable.logo_orange)
+
+    MainTheme(
+        lightColorPalette = k9LightColorPalette,
+        darkColorPalette = k9DarkColorPalette,
+        lightImages = images,
+        darkImages = images,
+        darkTheme = darkTheme,
+        content = content
+    )
+}
diff --git a/core/ui/compose/demo/src/main/java/app/k9mail/core/ui/compose/theme/ThunderbirdTheme.kt b/core/ui/compose/demo/src/main/java/app/k9mail/core/ui/compose/theme/ThunderbirdTheme.kt
new file mode 100644
index 0000000000..eda8cdfd91
--- /dev/null
+++ b/core/ui/compose/demo/src/main/java/app/k9mail/core/ui/compose/theme/ThunderbirdTheme.kt
@@ -0,0 +1,37 @@
+package app.k9mail.core.ui.compose.theme
+
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material.darkColors
+import androidx.compose.material.lightColors
+import androidx.compose.runtime.Composable
+
+private val thunderbirdLightColorPalette = lightColors(
+    primary = material_blue_600,
+    primaryVariant = material_light_blue_500,
+    secondary = material_pink_500,
+    secondaryVariant = material_pink_300
+)
+
+private val thunderbirdDarkColorPalette = darkColors(
+    primary = material_blue_100,
+    primaryVariant = material_blue_50,
+    secondary = material_pink_300,
+    secondaryVariant = material_pink_500
+)
+
+@Composable
+fun ThunderbirdTheme(
+    darkTheme: Boolean = isSystemInDarkTheme(),
+    content: @Composable () -> Unit
+) {
+    val images = Images(logo = app.k9mail.core.ui.compose.demo.R.drawable.logo_teal)
+
+    MainTheme(
+        lightColorPalette = thunderbirdLightColorPalette,
+        darkColorPalette = thunderbirdDarkColorPalette,
+        lightImages = images,
+        darkImages = images,
+        darkTheme = darkTheme,
+        content = content
+    )
+}
diff --git a/core/ui/compose/demo/src/main/res/drawable/logo_orange.xml b/core/ui/compose/demo/src/main/res/drawable/logo_orange.xml
new file mode 100644
index 0000000000..597a4f6c96
--- /dev/null
+++ b/core/ui/compose/demo/src/main/res/drawable/logo_orange.xml
@@ -0,0 +1,104 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="192"
+    android:viewportHeight="192">
+    <group
+        android:scaleX="0.52411765"
+        android:scaleY="0.52411765"
+        android:translateX="45.684708"
+        android:translateY="44.75294">
+        <path
+            android:fillAlpha="0.2"
+            android:fillColor="#000000"
+            android:pathData="M50,12C46.68,12 44,14.68 44,18V26C44,29.32 46.68,32 50,32H64V48H72V32H74C77.32,32 80,29.32 80,26V18C80,14.68 77.32,12 74,12H50ZM118,12C114.68,12 112,14.68 112,18V26C112,29.32 114.68,32 118,32H120V48H128V32H142C145.32,32 148,29.32 148,26V18C148,14.68 145.32,12 142,12H118ZM32,120V132L57.61,170C59.68,173.59 63.54,176 68,176H124C128.46,176 132.32,173.59 134.39,170H134.4L160,132V120H32Z"
+            android:strokeAlpha="0.2" />
+        <path
+            android:fillAlpha="0.2"
+            android:fillColor="#000000"
+            android:pathData="M50,8C46.68,8 44,10.68 44,14V22C44,25.32 46.68,28 50,28H64V44H72V28H74C77.32,28 80,25.32 80,22V14C80,10.68 77.32,8 74,8H50ZM118,8C114.68,8 112,10.68 112,14V22C112,25.32 114.68,28 118,28H120V44H128V28H142C145.32,28 148,25.32 148,22V14C148,10.68 145.32,8 142,8H118ZM32,116V128L57.61,166C59.68,169.59 63.54,172 68,172H124C128.46,172 132.32,169.59 134.39,166H134.4L160,128V116H32Z"
+            android:strokeAlpha="0.2" />
+        <path
+            android:fillAlpha="0.2"
+            android:fillColor="#000000"
+            android:pathData="M24,116L32,128L57.61,166C59.68,169.59 63.54,172 68,172H124C128.46,172 132.32,169.59 134.39,166H134.4L160,128L168,116H24Z"
+            android:strokeAlpha="0.2" />
+        <path
+            android:fillColor="#607D8B"
+            android:pathData="M32,116V128L57.61,166C59.68,169.59 63.54,172 68,172H124C128.46,172 132.32,169.59 134.39,166H134.4L160.01,128V116H32Z" />
+        <path
+            android:fillColor="#263238"
+            android:pathData="M72,16H64V44H72V16Z" />
+        <path
+            android:fillColor="#263238"
+            android:pathData="M128,16H120V44H128V16Z" />
+        <path
+            android:fillColor="#4D6570"
+            android:pathData="M32,127V128L57.61,166C59.68,169.59 63.54,172 68,172H124C128.46,172 132.32,169.59 134.39,166H134.4L160,128V127L134.4,165H134.39C132.32,168.59 128.46,171 124,171H68C63.54,171 59.68,168.59 57.61,165L32,127Z" />
+        <path
+            android:fillColor="#607D8B"
+            android:pathData="M80,22V14C80,10.69 77.31,8 74,8L50,8C46.69,8 44,10.69 44,14V22C44,25.31 46.69,28 50,28L74,28C77.31,28 80,25.31 80,22Z" />
+        <path
+            android:fillColor="#607D8B"
+            android:pathData="M148,22V14C148,10.69 145.31,8 142,8L118,8C114.69,8 112,10.69 112,14V22C112,25.31 114.69,28 118,28L142,28C145.31,28 148,25.31 148,22Z" />
+        <path
+            android:fillColor="#4D6570"
+            android:pathData="M44,21V22C44,25.32 46.68,28 50,28H74C77.32,28 80,25.32 80,22V21C80,24.32 77.32,27 74,27H50C46.68,27 44,24.32 44,21Z" />
+        <path
+            android:fillColor="#4D6570"
+            android:pathData="M112,21V22C112,25.32 114.68,28 118,28H142C145.32,28 148,25.32 148,22V21C148,24.32 145.32,27 142,27H118C114.68,27 112,24.32 112,21Z" />
+        <path
+            android:fillColor="#8097A2"
+            android:pathData="M50,8C46.68,8 44,10.68 44,14V15C44,11.68 46.68,9 50,9H74C77.32,9 80,11.68 80,15V14C80,10.68 77.32,8 74,8H50Z" />
+        <path
+            android:fillColor="#8097A2"
+            android:pathData="M118,8C114.68,8 112,10.68 112,14V15C112,11.68 114.68,9 118,9H142C145.32,9 148,11.68 148,15V14C148,10.68 145.32,8 142,8H118Z" />
+        <path
+            android:fillAlpha="0.2"
+            android:fillColor="#37abc8"
+            android:pathData="M171.99,120V52C171.99,45.37 166.62,40 159.99,40L31.99,40C25.37,40 19.99,45.37 19.99,52V120C19.99,126.62 25.37,132 31.99,132H159.99C166.62,132 171.99,126.62 171.99,120Z"
+            android:strokeAlpha="0.2" />
+        <path
+            android:fillAlpha="0.2"
+            android:fillColor="#5fbcd3"
+            android:pathData="M171.99,116V48C171.99,41.37 166.62,36 159.99,36L31.99,36C25.37,36 19.99,41.37 19.99,48V116C19.99,122.62 25.37,128 31.99,128L159.99,128C166.62,128 171.99,122.62 171.99,116Z"
+            android:strokeAlpha="0.2" />
+        <path
+            android:fillColor="#FFB74D"
+            android:pathData="M172,116V48C172,41.37 166.63,36 160,36L32,36C25.37,36 20,41.37 20,48V116C20,122.63 25.37,128 32,128H160C166.63,128 172,122.63 172,116Z" />
+        <path
+            android:fillColor="#00000000"
+            android:pathData="M36,52L96,84L156,52"
+            android:strokeWidth="6"
+            android:strokeColor="#FBE9E7"
+            android:strokeLineCap="round" />
+        <path
+            android:fillColor="#FFB74D"
+            android:pathData="M32,36C25.35,36 20,41.35 20,48V49C20,42.35 25.35,37 32,37H160C166.65,37 172,42.35 172,49V48C172,41.35 166.65,36 160,36H32Z" />
+        <path
+            android:fillColor="#F57C00"
+            android:pathData="M20,115V116C20,122.65 25.35,128 32,128H160C166.65,128 172,122.65 172,116V115C172,121.65 166.65,127 160,127H32C25.35,127 20,121.65 20,115Z" />
+        <path
+            android:fillAlpha="0.2"
+            android:fillColor="#000000"
+            android:pathData="M90,156C86.68,156 84,158.68 84,162V174C84,174.27 84.03,174.54 84.06,174.8C84.06,174.8 84.06,174.81 84.06,174.81C84.02,175.2 84,175.6 84,176C84,179.18 85.26,182.23 87.51,184.48C89.77,186.73 92.82,188 96,188C99.18,188 102.24,186.73 104.49,184.48C106.74,182.23 108,179.18 108,176C108,175.61 107.97,175.23 107.93,174.85C107.97,174.57 108,174.29 108,174V162C108,158.67 105.33,156 102,156L90,156Z"
+            android:strokeAlpha="0.2" />
+        <path
+            android:fillAlpha="0.2"
+            android:fillColor="#000000"
+            android:pathData="M90,152C86.68,152 84,154.68 84,158V170C84,170.27 84.03,170.54 84.06,170.8C84.06,170.8 84.06,170.81 84.06,170.81C84.02,171.2 84,171.6 84,172C84,175.18 85.26,178.23 87.51,180.48C89.77,182.73 92.82,184 96,184C99.18,184 102.24,182.73 104.49,180.48C106.74,178.23 108,175.18 108,172C108,171.61 107.97,171.23 107.93,170.85C107.97,170.57 108,170.29 108,170V158C108,154.67 105.33,152 102,152L90,152Z"
+            android:strokeAlpha="0.2" />
+        <path
+            android:fillColor="#263238"
+            android:pathData="M108,170V158C108,154.69 105.31,152 102,152H90C86.69,152 84,154.69 84,158V170C84,173.31 86.69,176 90,176H102C105.31,176 108,173.31 108,170Z" />
+        <path
+            android:fillColor="#263238"
+            android:pathData="M96,184C102.63,184 108,178.63 108,172C108,165.37 102.63,160 96,160C89.37,160 84,165.37 84,172C84,178.63 89.37,184 96,184Z" />
+        <path
+            android:fillColor="#37474F"
+            android:pathData="M90,152C86.68,152 84,154.68 84,158V159C84,155.68 86.68,153 90,153H102C105.32,153 108,155.68 108,159V158C108,154.68 105.32,152 102,152H90Z" />
+        <path
+            android:fillColor="#1A252A"
+            android:pathData="M84.02,171.43C84.01,171.62 84,171.81 84,172C84,175.18 85.26,178.24 87.51,180.49C89.77,182.74 92.82,184 96,184C99.18,184 102.24,182.74 104.49,180.49C106.74,178.24 108,175.18 108,172C108,171.86 107.99,171.73 107.98,171.59C107.83,174.67 106.5,177.57 104.27,179.69C102.04,181.81 99.08,183 96,183C92.89,183 89.91,181.79 87.68,179.63C85.44,177.47 84.13,174.53 84.02,171.43Z" />
+    </group>
+</vector>
diff --git a/core/ui/compose/demo/src/main/res/drawable/logo_teal.xml b/core/ui/compose/demo/src/main/res/drawable/logo_teal.xml
new file mode 100644
index 0000000000..290c1b6ada
--- /dev/null
+++ b/core/ui/compose/demo/src/main/res/drawable/logo_teal.xml
@@ -0,0 +1,104 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="192"
+    android:viewportHeight="192">
+    <group
+        android:scaleX="0.52411765"
+        android:scaleY="0.52411765"
+        android:translateX="45.684708"
+        android:translateY="44.75294">
+        <path
+            android:fillAlpha="0.2"
+            android:fillColor="#000000"
+            android:pathData="M50,12C46.68,12 44,14.68 44,18V26C44,29.32 46.68,32 50,32H64V48H72V32H74C77.32,32 80,29.32 80,26V18C80,14.68 77.32,12 74,12H50ZM118,12C114.68,12 112,14.68 112,18V26C112,29.32 114.68,32 118,32H120V48H128V32H142C145.32,32 148,29.32 148,26V18C148,14.68 145.32,12 142,12H118ZM32,120V132L57.61,170C59.68,173.59 63.54,176 68,176H124C128.46,176 132.32,173.59 134.39,170H134.4L160,132V120H32Z"
+            android:strokeAlpha="0.2" />
+        <path
+            android:fillAlpha="0.2"
+            android:fillColor="#000000"
+            android:pathData="M50,8C46.68,8 44,10.68 44,14V22C44,25.32 46.68,28 50,28H64V44H72V28H74C77.32,28 80,25.32 80,22V14C80,10.68 77.32,8 74,8H50ZM118,8C114.68,8 112,10.68 112,14V22C112,25.32 114.68,28 118,28H120V44H128V28H142C145.32,28 148,25.32 148,22V14C148,10.68 145.32,8 142,8H118ZM32,116V128L57.61,166C59.68,169.59 63.54,172 68,172H124C128.46,172 132.32,169.59 134.39,166H134.4L160,128V116H32Z"
+            android:strokeAlpha="0.2" />
+        <path
+            android:fillAlpha="0.2"
+            android:fillColor="#000000"
+            android:pathData="M24,116L32,128L57.61,166C59.68,169.59 63.54,172 68,172H124C128.46,172 132.32,169.59 134.39,166H134.4L160,128L168,116H24Z"
+            android:strokeAlpha="0.2" />
+        <path
+            android:fillColor="#607D8B"
+            android:pathData="M32,116V128L57.61,166C59.68,169.59 63.54,172 68,172H124C128.46,172 132.32,169.59 134.39,166H134.4L160.01,128V116H32Z" />
+        <path
+            android:fillColor="#263238"
+            android:pathData="M72,16H64V44H72V16Z" />
+        <path
+            android:fillColor="#263238"
+            android:pathData="M128,16H120V44H128V16Z" />
+        <path
+            android:fillColor="#4D6570"
+            android:pathData="M32,127V128L57.61,166C59.68,169.59 63.54,172 68,172H124C128.46,172 132.32,169.59 134.39,166H134.4L160,128V127L134.4,165H134.39C132.32,168.59 128.46,171 124,171H68C63.54,171 59.68,168.59 57.61,165L32,127Z" />
+        <path
+            android:fillColor="#607D8B"
+            android:pathData="M80,22V14C80,10.69 77.31,8 74,8L50,8C46.69,8 44,10.69 44,14V22C44,25.31 46.69,28 50,28L74,28C77.31,28 80,25.31 80,22Z" />
+        <path
+            android:fillColor="#607D8B"
+            android:pathData="M148,22V14C148,10.69 145.31,8 142,8L118,8C114.69,8 112,10.69 112,14V22C112,25.31 114.69,28 118,28L142,28C145.31,28 148,25.31 148,22Z" />
+        <path
+            android:fillColor="#4D6570"
+            android:pathData="M44,21V22C44,25.32 46.68,28 50,28H74C77.32,28 80,25.32 80,22V21C80,24.32 77.32,27 74,27H50C46.68,27 44,24.32 44,21Z" />
+        <path
+            android:fillColor="#4D6570"
+            android:pathData="M112,21V22C112,25.32 114.68,28 118,28H142C145.32,28 148,25.32 148,22V21C148,24.32 145.32,27 142,27H118C114.68,27 112,24.32 112,21Z" />
+        <path
+            android:fillColor="#8097A2"
+            android:pathData="M50,8C46.68,8 44,10.68 44,14V15C44,11.68 46.68,9 50,9H74C77.32,9 80,11.68 80,15V14C80,10.68 77.32,8 74,8H50Z" />
+        <path
+            android:fillColor="#8097A2"
+            android:pathData="M118,8C114.68,8 112,10.68 112,14V15C112,11.68 114.68,9 118,9H142C145.32,9 148,11.68 148,15V14C148,10.68 145.32,8 142,8H118Z" />
+        <path
+            android:fillAlpha="0.2"
+            android:fillColor="#37abc8"
+            android:pathData="M171.99,120V52C171.99,45.37 166.62,40 159.99,40L31.99,40C25.37,40 19.99,45.37 19.99,52V120C19.99,126.62 25.37,132 31.99,132H159.99C166.62,132 171.99,126.62 171.99,120Z"
+            android:strokeAlpha="0.2" />
+        <path
+            android:fillAlpha="0.2"
+            android:fillColor="#5fbcd3"
+            android:pathData="M171.99,116V48C171.99,41.37 166.62,36 159.99,36L31.99,36C25.37,36 19.99,41.37 19.99,48V116C19.99,122.62 25.37,128 31.99,128L159.99,128C166.62,128 171.99,122.62 171.99,116Z"
+            android:strokeAlpha="0.2" />
+        <path
+            android:fillColor="#4DB6AC"
+            android:pathData="M172,116V48C172,41.37 166.63,36 160,36L32,36C25.37,36 20,41.37 20,48V116C20,122.63 25.37,128 32,128H160C166.63,128 172,122.63 172,116Z" />
+        <path
+            android:fillColor="#00000000"
+            android:pathData="M36,52L96,84L156,52"
+            android:strokeWidth="6"
+            android:strokeColor="#FBE9E7"
+            android:strokeLineCap="round" />
+        <path
+            android:fillColor="#4DB6AC"
+            android:pathData="M32,36C25.35,36 20,41.35 20,48V49C20,42.35 25.35,37 32,37H160C166.65,37 172,42.35 172,49V48C172,41.35 166.65,36 160,36H32Z" />
+        <path
+            android:fillColor="#00796B"
+            android:pathData="M20,115V116C20,122.65 25.35,128 32,128H160C166.65,128 172,122.65 172,116V115C172,121.65 166.65,127 160,127H32C25.35,127 20,121.65 20,115Z" />
+        <path
+            android:fillAlpha="0.2"
+            android:fillColor="#000000"
+            android:pathData="M90,156C86.68,156 84,158.68 84,162V174C84,174.27 84.03,174.54 84.06,174.8C84.06,174.8 84.06,174.81 84.06,174.81C84.02,175.2 84,175.6 84,176C84,179.18 85.26,182.23 87.51,184.48C89.77,186.73 92.82,188 96,188C99.18,188 102.24,186.73 104.49,184.48C106.74,182.23 108,179.18 108,176C108,175.61 107.97,175.23 107.93,174.85C107.97,174.57 108,174.29 108,174V162C108,158.67 105.33,156 102,156L90,156Z"
+            android:strokeAlpha="0.2" />
+        <path
+            android:fillAlpha="0.2"
+            android:fillColor="#000000"
+            android:pathData="M90,152C86.68,152 84,154.68 84,158V170C84,170.27 84.03,170.54 84.06,170.8C84.06,170.8 84.06,170.81 84.06,170.81C84.02,171.2 84,171.6 84,172C84,175.18 85.26,178.23 87.51,180.48C89.77,182.73 92.82,184 96,184C99.18,184 102.24,182.73 104.49,180.48C106.74,178.23 108,175.18 108,172C108,171.61 107.97,171.23 107.93,170.85C107.97,170.57 108,170.29 108,170V158C108,154.67 105.33,152 102,152L90,152Z"
+            android:strokeAlpha="0.2" />
+        <path
+            android:fillColor="#263238"
+            android:pathData="M108,170V158C108,154.69 105.31,152 102,152H90C86.69,152 84,154.69 84,158V170C84,173.31 86.69,176 90,176H102C105.31,176 108,173.31 108,170Z" />
+        <path
+            android:fillColor="#263238"
+            android:pathData="M96,184C102.63,184 108,178.63 108,172C108,165.37 102.63,160 96,160C89.37,160 84,165.37 84,172C84,178.63 89.37,184 96,184Z" />
+        <path
+            android:fillColor="#37474F"
+            android:pathData="M90,152C86.68,152 84,154.68 84,158V159C84,155.68 86.68,153 90,153H102C105.32,153 108,155.68 108,159V158C108,154.68 105.32,152 102,152H90Z" />
+        <path
+            android:fillColor="#1A252A"
+            android:pathData="M84.02,171.43C84.01,171.62 84,171.81 84,172C84,175.18 85.26,178.24 87.51,180.49C89.77,182.74 92.82,184 96,184C99.18,184 102.24,182.74 104.49,180.49C106.74,178.24 108,175.18 108,172C108,171.86 107.99,171.73 107.98,171.59C107.83,174.67 106.5,177.57 104.27,179.69C102.04,181.81 99.08,183 96,183C92.89,183 89.91,181.79 87.68,179.63C85.44,177.47 84.13,174.53 84.02,171.43Z" />
+    </group>
+</vector>
diff --git a/core/ui/compose/theme/src/main/java/app/k9mail/core/ui/compose/theme/Color.kt b/core/ui/compose/theme/src/main/java/app/k9mail/core/ui/compose/theme/Color.kt
index 73832cae07..f55d7fd1d2 100644
--- a/core/ui/compose/theme/src/main/java/app/k9mail/core/ui/compose/theme/Color.kt
+++ b/core/ui/compose/theme/src/main/java/app/k9mail/core/ui/compose/theme/Color.kt
@@ -194,11 +194,11 @@ val material_lime_900 = Color(0xFF827717)
 val material_orange_50 = Color(0xFFFFF3E0)
 val material_orange_100 = Color(0xFFFFE0B2)
 val material_orange_200 = Color(0xFFFFCC80)
-val material_orange_300 = Color(0xFFFFB74D) //
+val material_orange_300 = Color(0xFFFFB74D)
 val material_orange_400 = Color(0xFFFFA726)
 val material_orange_500 = Color(0xFFFF9800)
 val material_orange_600 = Color(0xFFFB8C00)
-val material_orange_700 = Color(0xFFF57C00) //
+val material_orange_700 = Color(0xFFF57C00)
 val material_orange_800 = Color(0xFFEF6C00)
 val material_orange_900 = Color(0xFFE65100)
 
diff --git a/core/ui/compose/theme/src/main/java/app/k9mail/core/ui/compose/theme/MainTheme.kt b/core/ui/compose/theme/src/main/java/app/k9mail/core/ui/compose/theme/MainTheme.kt
index abb67426b1..4d09612434 100644
--- a/core/ui/compose/theme/src/main/java/app/k9mail/core/ui/compose/theme/MainTheme.kt
+++ b/core/ui/compose/theme/src/main/java/app/k9mail/core/ui/compose/theme/MainTheme.kt
@@ -36,8 +36,8 @@ fun MainTheme(
     ) {
         MaterialTheme(
             colors = colors,
-            typography = Typography,
-            shapes = Shapes,
+            typography = typography,
+            shapes = shapes,
             content = content
         )
     }
diff --git a/core/ui/compose/theme/src/main/java/app/k9mail/core/ui/compose/theme/Shapes.kt b/core/ui/compose/theme/src/main/java/app/k9mail/core/ui/compose/theme/Shapes.kt
index b689d49de2..e7ed7465c7 100644
--- a/core/ui/compose/theme/src/main/java/app/k9mail/core/ui/compose/theme/Shapes.kt
+++ b/core/ui/compose/theme/src/main/java/app/k9mail/core/ui/compose/theme/Shapes.kt
@@ -4,7 +4,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Shapes
 import androidx.compose.ui.unit.dp
 
-val Shapes = Shapes(
+val shapes = Shapes(
     small = RoundedCornerShape(8.dp),
     medium = RoundedCornerShape(4.dp),
     large = RoundedCornerShape(0.dp)
diff --git a/core/ui/compose/theme/src/main/java/app/k9mail/core/ui/compose/theme/Typography.kt b/core/ui/compose/theme/src/main/java/app/k9mail/core/ui/compose/theme/Typography.kt
index 24b6d761c0..8cc8417a38 100644
--- a/core/ui/compose/theme/src/main/java/app/k9mail/core/ui/compose/theme/Typography.kt
+++ b/core/ui/compose/theme/src/main/java/app/k9mail/core/ui/compose/theme/Typography.kt
@@ -6,7 +6,7 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.sp
 
-val Typography = typographyFromDefaults(
+val typography = typographyFromDefaults(
     h1 = TextStyle(
         fontFamily = FontFamily.Default,
         fontWeight = FontWeight.Light,