diff --git a/app/src/main/java/de/pawcode/cardstore/navigation/Navigation.kt b/app/src/main/java/de/pawcode/cardstore/navigation/Navigation.kt
index 5e4a6c6..eac5f44 100644
--- a/app/src/main/java/de/pawcode/cardstore/navigation/Navigation.kt
+++ b/app/src/main/java/de/pawcode/cardstore/navigation/Navigation.kt
@@ -55,6 +55,7 @@ fun Navigation(modifier: Modifier = Modifier) {
         snackbar = { snackbarData ->
           Snackbar(
             snackbarData = snackbarData,
+            shape = MaterialTheme.shapes.medium,
             containerColor = MaterialTheme.colorScheme.inverseSurface,
             contentColor = MaterialTheme.colorScheme.inverseOnSurface,
             actionColor = MaterialTheme.colorScheme.inversePrimary,
diff --git a/app/src/main/java/de/pawcode/cardstore/ui/components/AddCardComponent.kt b/app/src/main/java/de/pawcode/cardstore/ui/components/AddCardComponent.kt
index a85549f..0a4ea6b 100644
--- a/app/src/main/java/de/pawcode/cardstore/ui/components/AddCardComponent.kt
+++ b/app/src/main/java/de/pawcode/cardstore/ui/components/AddCardComponent.kt
@@ -30,6 +30,7 @@ fun AddCardComponent(hasCards: Boolean, onClick: () -> Unit) {
     modifier = Modifier.fillMaxWidth().aspectRatio(1.586f).clickable { onClick() },
     colors =
       CardDefaults.outlinedCardColors(containerColor = MaterialTheme.colorScheme.surfaceContainer),
+    shape = MaterialTheme.shapes.large,
   ) {
     Column(
       horizontalAlignment = Alignment.CenterHorizontally,
diff --git a/app/src/main/java/de/pawcode/cardstore/ui/components/AppBar.kt b/app/src/main/java/de/pawcode/cardstore/ui/components/AppBar.kt
index 581e1b8..f6eda2d 100644
--- a/app/src/main/java/de/pawcode/cardstore/ui/components/AppBar.kt
+++ b/app/src/main/java/de/pawcode/cardstore/ui/components/AppBar.kt
@@ -5,6 +5,8 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.automirrored.filled.Sort
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.FilledIconButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
@@ -16,15 +18,21 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import de.pawcode.cardstore.R
 
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 fun AppBar(
   title: String,
+  subtitle: String? = null,
   onBack: (() -> Unit)? = null,
   actions: @Composable (RowScope.() -> Unit)? = null,
 ) {
   TopAppBar(
     title = { Text(text = title) },
+    subtitle = {
+      if (subtitle != null) {
+        Text(text = subtitle)
+      }
+    },
     navigationIcon = {
       if (onBack != null) {
         IconButton(onClick = { onBack() }) {
@@ -41,6 +49,7 @@ fun AppBar(
         containerColor = MaterialTheme.colorScheme.primaryContainer,
         navigationIconContentColor = MaterialTheme.colorScheme.onPrimaryContainer,
         titleContentColor = MaterialTheme.colorScheme.onPrimaryContainer,
+        subtitleContentColor = MaterialTheme.colorScheme.onPrimaryContainer,
         actionIconContentColor = MaterialTheme.colorScheme.onPrimaryContainer,
       ),
   )
@@ -57,9 +66,10 @@ fun PreviewAppBar() {
 fun PreviewAppBarActions() {
   AppBar(
     title = "Card Store",
+    subtitle = "My cool card",
     onBack = {},
     actions = {
-      IconButton(onClick = {}) {
+      FilledIconButton(onClick = {}) {
         Icon(
           Icons.AutoMirrored.Filled.Sort,
           contentDescription = stringResource(R.string.cards_sort),
diff --git a/app/src/main/java/de/pawcode/cardstore/ui/components/CardComponent.kt b/app/src/main/java/de/pawcode/cardstore/ui/components/CardComponent.kt
index 6f695c8..03c6c97 100644
--- a/app/src/main/java/de/pawcode/cardstore/ui/components/CardComponent.kt
+++ b/app/src/main/java/de/pawcode/cardstore/ui/components/CardComponent.kt
@@ -44,6 +44,7 @@ fun CardComponent(card: CardEntity, onClick: () -> Unit, onLongPress: () -> Unit
         ),
     elevation = CardDefaults.cardElevation(defaultElevation = 8.dp),
     colors = CardDefaults.cardColors(containerColor = color),
+    shape = MaterialTheme.shapes.large,
   ) {
     Column(
       horizontalAlignment = Alignment.CenterHorizontally,
diff --git a/app/src/main/java/de/pawcode/cardstore/ui/components/EditCardForm.kt b/app/src/main/java/de/pawcode/cardstore/ui/components/EditCardForm.kt
index 5c19f81..db309a0 100644
--- a/app/src/main/java/de/pawcode/cardstore/ui/components/EditCardForm.kt
+++ b/app/src/main/java/de/pawcode/cardstore/ui/components/EditCardForm.kt
@@ -1,5 +1,6 @@
 package de.pawcode.cardstore.ui.components
 
+import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -267,6 +268,7 @@ fun EditCardForm(
           val chipSelected =
             label.labelId == card.labels.find { it.labelId == label.labelId }?.labelId
           FilterChip(
+            modifier = Modifier.padding(bottom = 4.dp),
             selected = chipSelected,
             onClick = {
               onCardUpdate(
@@ -282,13 +284,13 @@ fun EditCardForm(
             },
             label = {
               Text(
-                modifier = Modifier.padding(vertical = 8.dp),
+                modifier = Modifier.padding(vertical = 10.dp),
                 text = label.name,
                 style = MaterialTheme.typography.bodyLarge,
               )
             },
             leadingIcon = {
-              if (chipSelected) {
+              AnimatedVisibility(visible = chipSelected) {
                 Icon(Icons.Filled.Check, contentDescription = null)
               }
             },
diff --git a/app/src/main/java/de/pawcode/cardstore/ui/components/LabelsListComponent.kt b/app/src/main/java/de/pawcode/cardstore/ui/components/LabelsListComponent.kt
index 0e6d150..ac8a0c5 100644
--- a/app/src/main/java/de/pawcode/cardstore/ui/components/LabelsListComponent.kt
+++ b/app/src/main/java/de/pawcode/cardstore/ui/components/LabelsListComponent.kt
@@ -1,5 +1,6 @@
 package de.pawcode.cardstore.ui.components
 
+import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
@@ -11,9 +12,11 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.Check
 import androidx.compose.material.icons.filled.EditNote
-import androidx.compose.material3.FilledTonalIconButton
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.FilledIconButton
 import androidx.compose.material3.FilterChip
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButtonDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -27,6 +30,7 @@ import de.pawcode.cardstore.data.database.entities.EXAMPLE_LABEL
 import de.pawcode.cardstore.data.database.entities.EXAMPLE_LABEL_LIST
 import de.pawcode.cardstore.data.database.entities.LabelEntity
 
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 fun LabelsListComponent(
   labels: List<LabelEntity>,
@@ -57,15 +61,16 @@ fun LabelsListComponent(
           FilterChip(
             selected = chipSelected,
             onClick = { onLabelClick(label) },
+            shape = MaterialTheme.shapes.medium,
             label = {
               Text(
-                modifier = Modifier.padding(vertical = 8.dp),
+                modifier = Modifier.padding(vertical = 10.dp),
                 text = label.name,
                 style = MaterialTheme.typography.bodyLarge,
               )
             },
             leadingIcon = {
-              if (chipSelected) {
+              AnimatedVisibility(visible = chipSelected) {
                 Icon(Icons.Filled.Check, contentDescription = null)
               }
             },
@@ -74,11 +79,23 @@ fun LabelsListComponent(
       }
     }
 
-    FilledTonalIconButton(shape = MaterialTheme.shapes.small, onClick = { onEdit() }) {
+    FilledIconButton(
+      modifier =
+        Modifier.padding(start = 8.dp)
+          .size(
+            IconButtonDefaults.smallContainerSize(IconButtonDefaults.IconButtonWidthOption.Wide)
+          ),
+      shapes =
+        IconButtonDefaults.shapes(
+          shape = IconButtonDefaults.smallSquareShape,
+          pressedShape = IconButtonDefaults.smallPressedShape,
+        ),
+      onClick = { onEdit() },
+    ) {
       Icon(
         imageVector = if (labels.isNotEmpty()) Icons.Filled.EditNote else Icons.Filled.Add,
         contentDescription = stringResource(R.string.labels_edit),
-        modifier = Modifier.size(32.dp),
+        modifier = Modifier.size(IconButtonDefaults.smallIconSize),
       )
     }
   }
diff --git a/app/src/main/java/de/pawcode/cardstore/ui/components/SelectDropdownMenu.kt b/app/src/main/java/de/pawcode/cardstore/ui/components/SelectDropdownMenu.kt
index 4ceb70d..dac751a 100644
--- a/app/src/main/java/de/pawcode/cardstore/ui/components/SelectDropdownMenu.kt
+++ b/app/src/main/java/de/pawcode/cardstore/ui/components/SelectDropdownMenu.kt
@@ -1,5 +1,9 @@
 package de.pawcode.cardstore.ui.components
 
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.Sort
 import androidx.compose.material.icons.automirrored.filled.TrendingUp
@@ -9,18 +13,24 @@ import androidx.compose.material.icons.filled.History
 import androidx.compose.material.icons.filled.SortByAlpha
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
+import androidx.compose.material3.IconButtonDefaults
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.DpOffset
+import androidx.compose.ui.unit.dp
 import de.pawcode.cardstore.R
 import de.pawcode.cardstore.data.enums.SortAttribute
 
@@ -30,6 +40,7 @@ data class DropdownOption<TValue : Enum<TValue>>(
   val value: TValue,
 )
 
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 fun <TValue : Enum<TValue>> SelectDropdownMenu(
   icon: ImageVector,
@@ -41,25 +52,52 @@ fun <TValue : Enum<TValue>> SelectDropdownMenu(
 ) {
   var dropdownExpanded by remember { mutableStateOf(initiallyExpanded) }
 
-  IconButton(onClick = { dropdownExpanded = !dropdownExpanded }) {
-    Icon(icon, contentDescription = title)
-  }
-  DropdownMenu(expanded = dropdownExpanded, onDismissRequest = { dropdownExpanded = false }) {
-    values.forEach { option ->
-      DropdownMenuItem(
-        text = { Text(text = option.title, maxLines = 1, overflow = TextOverflow.Ellipsis) },
-        leadingIcon = { Icon(imageVector = option.icon, contentDescription = option.title) },
-        trailingIcon = {
-          if (value == option.value) {
-            Icon(Icons.Filled.Check, contentDescription = null)
-          }
-        },
-        onClick = {
-          onValueChange(option.value)
-          dropdownExpanded = false
-        },
+  Box {
+    IconButton(
+      modifier =
+        Modifier.size(
+          IconButtonDefaults.smallContainerSize(IconButtonDefaults.IconButtonWidthOption.Wide)
+        ),
+      onClick = { dropdownExpanded = !dropdownExpanded },
+      shapes =
+        IconButtonDefaults.shapes(
+          shape = IconButtonDefaults.smallRoundShape,
+          pressedShape = IconButtonDefaults.smallPressedShape,
+        ),
+    ) {
+      Icon(
+        icon,
+        contentDescription = title,
+        modifier = Modifier.size(IconButtonDefaults.smallIconSize),
       )
     }
+    DropdownMenu(
+      expanded = dropdownExpanded,
+      onDismissRequest = { dropdownExpanded = false },
+      offset = DpOffset(0.dp, 4.dp),
+      shape = MaterialTheme.shapes.medium,
+      containerColor = MaterialTheme.colorScheme.surfaceVariant,
+    ) {
+      values.forEach { option ->
+        DropdownMenuItem(
+          text = {
+            Text(
+              modifier = Modifier.padding(4.dp),
+              text = option.title,
+              maxLines = 1,
+              overflow = TextOverflow.Ellipsis,
+            )
+          },
+          leadingIcon = { Icon(imageVector = option.icon, contentDescription = option.title) },
+          trailingIcon = {
+            AnimatedVisibility(visible = value === option.value) {
+              Icon(Icons.Filled.Check, contentDescription = null)
+            }
+          },
+          onClick = { onValueChange(option.value) },
+        )
+      }
+    }
   }
 }
 
diff --git a/app/src/main/java/de/pawcode/cardstore/ui/components/SettingsGroup.kt b/app/src/main/java/de/pawcode/cardstore/ui/components/SettingsGroup.kt
index e2d04dd..dfe3cb0 100644
--- a/app/src/main/java/de/pawcode/cardstore/ui/components/SettingsGroup.kt
+++ b/app/src/main/java/de/pawcode/cardstore/ui/components/SettingsGroup.kt
@@ -24,11 +24,7 @@ fun SettingsGroup(modifier: Modifier = Modifier, title: String, content: @Compos
       modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
     )
 
-    Surface(
-      modifier = Modifier.fillMaxWidth(),
-      color = MaterialTheme.colorScheme.surface,
-      shape = MaterialTheme.shapes.extraLarge,
-    ) {
+    Surface(modifier = Modifier.fillMaxWidth(), shape = MaterialTheme.shapes.extraLarge) {
       Column(verticalArrangement = Arrangement.spacedBy(2.dp)) { content() }
     }
   }
@@ -40,27 +36,24 @@ fun PreviewSettingsGroup() {
   SettingsGroup(title = "About") {
     SettingsItem(
       icon = Icons.Default.Web,
-      iconColor = MaterialTheme.colorScheme.primaryContainer,
-      iconBackground = MaterialTheme.colorScheme.onPrimaryContainer,
+      iconColor = MaterialTheme.colorScheme.onPrimaryFixedVariant,
+      iconBackground = MaterialTheme.colorScheme.primaryFixed,
       title = "pawcode Development",
       subtitle = "View website",
       onClick = {},
     )
     SettingsItem(
       icon = Icons.Default.Web,
-      iconColor = MaterialTheme.colorScheme.secondaryContainer,
-      iconBackground = MaterialTheme.colorScheme.onSecondaryContainer,
+      iconColor = MaterialTheme.colorScheme.onSecondaryFixedVariant,
+      iconBackground = MaterialTheme.colorScheme.secondaryFixed,
       title = "pawcode Development",
-      subtitle = "View website",
-      onClick = {},
     )
     SettingsItem(
       icon = Icons.Default.Web,
-      iconColor = MaterialTheme.colorScheme.tertiaryContainer,
-      iconBackground = MaterialTheme.colorScheme.onTertiaryContainer,
+      iconColor = MaterialTheme.colorScheme.onTertiaryFixedVariant,
+      iconBackground = MaterialTheme.colorScheme.tertiaryFixed,
       title = "pawcode Development",
       subtitle = "View website",
-      onClick = {},
     )
   }
 }
diff --git a/app/src/main/java/de/pawcode/cardstore/ui/components/SettingsItem.kt b/app/src/main/java/de/pawcode/cardstore/ui/components/SettingsItem.kt
index 819ac9b..974e634 100644
--- a/app/src/main/java/de/pawcode/cardstore/ui/components/SettingsItem.kt
+++ b/app/src/main/java/de/pawcode/cardstore/ui/components/SettingsItem.kt
@@ -4,14 +4,13 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Web
 import androidx.compose.material3.Icon
+import androidx.compose.material3.ListItem
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -32,44 +31,31 @@ fun SettingsItem(
   subtitle: String? = null,
   onClick: (() -> Unit)? = null,
 ) {
-  Row(
+  ListItem(
     modifier =
-      Modifier.fillMaxWidth()
-        .background(
-          color = MaterialTheme.colorScheme.surfaceContainer,
-          shape = MaterialTheme.shapes.extraSmall,
-        )
-        .then(if (onClick != null) Modifier.clickable { onClick() } else Modifier)
-        .padding(16.dp),
-    verticalAlignment = Alignment.CenterVertically,
-  ) {
-    Box(
-      modifier = Modifier.size(40.dp).clip(CircleShape).background(iconBackground),
-      contentAlignment = Alignment.Center,
-    ) {
-      Icon(
-        imageVector = icon,
-        contentDescription = null,
-        tint = iconColor,
-        modifier = Modifier.size(20.dp),
-      )
-    }
-
-    Column(modifier = Modifier.weight(1f).padding(horizontal = 16.dp)) {
-      Text(
-        text = title,
-        style = MaterialTheme.typography.bodyLarge,
-        color = MaterialTheme.colorScheme.onSurface,
-      )
-      subtitle?.let {
-        Text(
-          text = it,
-          style = MaterialTheme.typography.bodyMedium,
-          color = MaterialTheme.colorScheme.onSurfaceVariant,
+      Modifier.clip(MaterialTheme.shapes.extraSmall)
+        .then(if (onClick != null) Modifier.clickable { onClick() } else Modifier),
+    tonalElevation = 2.dp,
+    headlineContent = { Text(text = title) },
+    supportingContent = { subtitle?.let { Text(text = it) } },
+    leadingContent = {
+      Box(
+        modifier =
+          Modifier.padding(vertical = 8.dp)
+            .size(40.dp)
+            .clip(CircleShape)
+            .background(iconBackground),
+        contentAlignment = Alignment.Center,
+      ) {
+        Icon(
+          imageVector = icon,
+          contentDescription = null,
+          tint = iconColor,
+          modifier = Modifier.size(20.dp),
         )
       }
-    }
-  }
+    },
+  )
 }
 
 @Preview(showBackground = true)
@@ -78,22 +64,22 @@ fun PreviewSettingsItem() {
   Column {
     SettingsItem(
       icon = Icons.Default.Web,
-      iconColor = MaterialTheme.colorScheme.primaryFixed,
-      iconBackground = MaterialTheme.colorScheme.onPrimaryFixedVariant,
+      iconColor = MaterialTheme.colorScheme.onPrimaryFixedVariant,
+      iconBackground = MaterialTheme.colorScheme.primaryFixed,
       title = "pawcode Development",
       subtitle = "View website",
       onClick = {},
     )
     SettingsItem(
       icon = Icons.Default.Web,
-      iconColor = MaterialTheme.colorScheme.secondaryFixed,
-      iconBackground = MaterialTheme.colorScheme.onSecondaryFixedVariant,
+      iconColor = MaterialTheme.colorScheme.onSecondaryFixedVariant,
+      iconBackground = MaterialTheme.colorScheme.secondaryFixed,
       title = "pawcode Development",
     )
     SettingsItem(
       icon = Icons.Default.Web,
-      iconColor = MaterialTheme.colorScheme.tertiaryFixed,
-      iconBackground = MaterialTheme.colorScheme.onTertiaryFixedVariant,
+      iconColor = MaterialTheme.colorScheme.onTertiaryFixedVariant,
+      iconBackground = MaterialTheme.colorScheme.tertiaryFixed,
       title = "pawcode Development",
       subtitle = "View website",
     )
diff --git a/app/src/main/java/de/pawcode/cardstore/ui/screens/AboutScreen.kt b/app/src/main/java/de/pawcode/cardstore/ui/screens/AboutScreen.kt
index 40dc00d..0ea031c 100644
--- a/app/src/main/java/de/pawcode/cardstore/ui/screens/AboutScreen.kt
+++ b/app/src/main/java/de/pawcode/cardstore/ui/screens/AboutScreen.kt
@@ -2,6 +2,8 @@ package de.pawcode.cardstore.ui.screens
 
 import android.content.Intent
 import android.content.pm.PackageInfo
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
@@ -14,7 +16,6 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Android
 import androidx.compose.material.icons.filled.BugReport
 import androidx.compose.material.icons.filled.CameraAlt
-import androidx.compose.material.icons.filled.Code
 import androidx.compose.material.icons.filled.Colorize
 import androidx.compose.material.icons.filled.DataObject
 import androidx.compose.material.icons.filled.Gesture
@@ -23,8 +24,6 @@ import androidx.compose.material.icons.filled.Palette
 import androidx.compose.material.icons.filled.QrCode
 import androidx.compose.material.icons.filled.Scanner
 import androidx.compose.material.icons.filled.Storage
-import androidx.compose.material.icons.filled.Store
-import androidx.compose.material.icons.filled.Web
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
@@ -32,7 +31,9 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.core.net.toUri
@@ -119,8 +120,15 @@ fun AboutScreenComponent(
   val versionName = packageInfo.versionName ?: "Unknown version"
   val isDebug = packageInfo.packageName.endsWith(".debug")
 
-  Scaffold(topBar = { AppBar(title = stringResource(R.string.app_name), onBack = { onBack() }) }) {
-    innerPadding ->
+  Scaffold(
+    topBar = {
+      AppBar(
+        title = stringResource(R.string.app_name),
+        subtitle = stringResource(R.string.about),
+        onBack = { onBack() },
+      )
+    }
+  ) { innerPadding ->
     Column(
       modifier = Modifier.padding(innerPadding).fillMaxSize().verticalScroll(rememberScrollState()),
       horizontalAlignment = Alignment.CenterHorizontally,
@@ -128,13 +136,14 @@ fun AboutScreenComponent(
       Column(
         modifier = Modifier.widthIn(max = 500.dp).fillMaxWidth().padding(8.dp),
         verticalArrangement = Arrangement.spacedBy(24.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
       ) {
         // App Information Group
         SettingsGroup(title = stringResource(R.string.about)) {
           SettingsItem(
             icon = Icons.Filled.Info,
-            iconColor = MaterialTheme.colorScheme.primaryFixed,
-            iconBackground = MaterialTheme.colorScheme.onPrimaryFixedVariant,
+            iconColor = MaterialTheme.colorScheme.onSecondaryFixedVariant,
+            iconBackground = MaterialTheme.colorScheme.primaryFixed,
             title = stringResource(R.string.version) + if (isDebug) " (debug)" else "",
             subtitle = versionName + " (${packageInfo.longVersionCode})",
             onClick = {
@@ -148,27 +157,27 @@ fun AboutScreenComponent(
         // Links Group
         SettingsGroup(title = stringResource(R.string.links)) {
           SettingsItem(
-            icon = Icons.Filled.Web,
-            iconColor = MaterialTheme.colorScheme.secondaryFixed,
-            iconBackground = MaterialTheme.colorScheme.onSecondaryFixedVariant,
+            icon = ImageVector.vectorResource(R.drawable.icon),
+            iconColor = MaterialTheme.colorScheme.onSecondaryFixedVariant,
+            iconBackground = MaterialTheme.colorScheme.secondaryFixed,
             title = "pawcode Development",
             subtitle = stringResource(R.string.website),
             onClick = { onOpenWebsite(context.getString(R.string.website_link)) },
           )
 
           SettingsItem(
-            icon = Icons.Filled.Code,
-            iconColor = MaterialTheme.colorScheme.secondaryFixed,
-            iconBackground = MaterialTheme.colorScheme.onSecondaryFixedVariant,
+            icon = ImageVector.vectorResource(R.drawable.github_mark),
+            iconColor = MaterialTheme.colorScheme.onSecondaryFixedVariant,
+            iconBackground = MaterialTheme.colorScheme.secondaryFixed,
             title = stringResource(R.string.source_code),
             subtitle = stringResource(R.string.github_repository),
             onClick = { onOpenWebsite("https://github.com/pawcoding/card-store") },
           )
 
           SettingsItem(
-            icon = Icons.Filled.Store,
-            iconColor = MaterialTheme.colorScheme.secondaryFixed,
-            iconBackground = MaterialTheme.colorScheme.onSecondaryFixedVariant,
+            icon = ImageVector.vectorResource(R.drawable.google_play),
+            iconColor = MaterialTheme.colorScheme.onSecondaryFixedVariant,
+            iconBackground = MaterialTheme.colorScheme.secondaryFixed,
             title = stringResource(R.string.playstore),
             subtitle = stringResource(R.string.playstore_description),
             onClick = {
@@ -178,8 +187,8 @@ fun AboutScreenComponent(
 
           SettingsItem(
             icon = Icons.Filled.BugReport,
-            iconColor = MaterialTheme.colorScheme.secondaryFixed,
-            iconBackground = MaterialTheme.colorScheme.onSecondaryFixedVariant,
+            iconColor = MaterialTheme.colorScheme.onSecondaryFixedVariant,
+            iconBackground = MaterialTheme.colorScheme.secondaryFixed,
             title = stringResource(R.string.report_issue),
             subtitle = stringResource(R.string.github_issues),
             onClick = { onOpenWebsite("https://github.com/pawcoding/card-store/issues") },
@@ -191,21 +200,29 @@ fun AboutScreenComponent(
           TECHNOLOGIES.forEach { technology ->
             SettingsItem(
               icon = technology.icon,
-              iconColor = MaterialTheme.colorScheme.tertiaryFixed,
-              iconBackground = MaterialTheme.colorScheme.onTertiaryFixedVariant,
+              iconColor = MaterialTheme.colorScheme.onTertiaryFixedVariant,
+              iconBackground = MaterialTheme.colorScheme.tertiaryFixed,
               title = technology.name,
               subtitle = null,
               onClick = { onOpenWebsite(technology.url) },
             )
           }
         }
+
+        Image(
+          painter =
+            if (isSystemInDarkTheme()) painterResource(R.drawable.pawcode_light)
+            else painterResource(R.drawable.pawcode_dark),
+          contentDescription = "pawcode Development",
+          modifier = Modifier.padding(top = 24.dp).padding(12.dp).fillMaxWidth(.5f),
+        )
       }
     }
   }
 }
 
-@Preview
-@Preview(device = "id:pixel_tablet")
+@Preview(showSystemUi = true)
+@Preview(device = "id:pixel_tablet", showSystemUi = true)
 @Composable
 fun PreviewAboutScreenComponent() {
   val packageInfo = PackageInfo()
diff --git a/app/src/main/java/de/pawcode/cardstore/ui/screens/CardListScreen.kt b/app/src/main/java/de/pawcode/cardstore/ui/screens/CardListScreen.kt
index 864e3f7..4c541e7 100644
--- a/app/src/main/java/de/pawcode/cardstore/ui/screens/CardListScreen.kt
+++ b/app/src/main/java/de/pawcode/cardstore/ui/screens/CardListScreen.kt
@@ -1,10 +1,13 @@
 package de.pawcode.cardstore.ui.screens
 
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.statusBars
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.grid.rememberLazyGridState
@@ -13,6 +16,7 @@ import androidx.compose.material.icons.automirrored.filled.Sort
 import androidx.compose.material.icons.automirrored.filled.TrendingUp
 import androidx.compose.material.icons.filled.AddCard
 import androidx.compose.material.icons.filled.AutoFixHigh
+import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.DeleteForever
 import androidx.compose.material.icons.filled.Edit
 import androidx.compose.material.icons.filled.History
@@ -23,9 +27,14 @@ import androidx.compose.material.icons.outlined.Info
 import androidx.compose.material.icons.outlined.QrCodeScanner
 import androidx.compose.material.icons.twotone.CreditCard
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.ExtendedFloatingActionButton
+import androidx.compose.material3.FloatingActionButtonMenu
+import androidx.compose.material3.FloatingActionButtonMenuItem
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
+import androidx.compose.material3.IconButtonDefaults
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
@@ -150,7 +159,7 @@ fun CardListScreen(navController: NavController, viewModel: CardViewModel = view
   )
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 fun CardListScreenComponent(
   cardsFlow: Flow<List<CardWithLabels>>,
@@ -183,7 +192,6 @@ fun CardListScreenComponent(
   val cardShareSheetState = rememberModalBottomSheetState()
   val cardImportSheetState = rememberModalBottomSheetState()
   val cardOptionSheetState = rememberModalBottomSheetState()
-  val cardCreateSheetState = rememberModalBottomSheetState()
 
   var selectedLabel by remember { mutableStateOf<String?>(null) }
 
@@ -216,49 +224,114 @@ fun CardListScreenComponent(
       AppBar(
         title = stringResource(R.string.app_name),
         actions = {
-          IconButton(onClick = { onShowAbout() }) {
-            Icon(Icons.Outlined.Info, contentDescription = stringResource(R.string.about))
-          }
-          SelectDropdownMenu(
-            icon = Icons.AutoMirrored.Filled.Sort,
-            title = stringResource(R.string.cards_sort),
-            value = sortBy,
-            values =
-              listOf(
-                DropdownOption(
-                  title = stringResource(R.string.sort_intelligent),
-                  icon = Icons.Filled.AutoFixHigh,
-                  value = SortAttribute.INTELLIGENT,
-                ),
-                DropdownOption(
-                  title = stringResource(R.string.sort_alphabetically),
-                  icon = Icons.Filled.SortByAlpha,
-                  value = SortAttribute.ALPHABETICALLY,
+          Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+            IconButton(
+              modifier =
+                Modifier.size(
+                  IconButtonDefaults.smallContainerSize(
+                    IconButtonDefaults.IconButtonWidthOption.Wide
+                  )
                 ),
-                DropdownOption(
-                  title = stringResource(R.string.sort_most_used),
-                  icon = Icons.AutoMirrored.Filled.TrendingUp,
-                  value = SortAttribute.MOST_USED,
+              onClick = { onShowAbout() },
+              shapes =
+                IconButtonDefaults.shapes(
+                  shape = IconButtonDefaults.smallRoundShape,
+                  pressedShape = IconButtonDefaults.smallPressedShape,
                 ),
-                DropdownOption(
-                  title = stringResource(R.string.sort_recently_used),
-                  icon = Icons.Filled.History,
-                  value = SortAttribute.RECENTLY_USED,
+            ) {
+              Icon(
+                Icons.Outlined.Info,
+                contentDescription = stringResource(R.string.about),
+                modifier = Modifier.size(IconButtonDefaults.smallIconSize),
+              )
+            }
+
+            SelectDropdownMenu(
+              icon = Icons.AutoMirrored.Filled.Sort,
+              title = stringResource(R.string.cards_sort),
+              value = sortBy,
+              values =
+                listOf(
+                  DropdownOption(
+                    title = stringResource(R.string.sort_intelligent),
+                    icon = Icons.Filled.AutoFixHigh,
+                    value = SortAttribute.INTELLIGENT,
+                  ),
+                  DropdownOption(
+                    title = stringResource(R.string.sort_alphabetically),
+                    icon = Icons.Filled.SortByAlpha,
+                    value = SortAttribute.ALPHABETICALLY,
+                  ),
+                  DropdownOption(
+                    title = stringResource(R.string.sort_most_used),
+                    icon = Icons.AutoMirrored.Filled.TrendingUp,
+                    value = SortAttribute.MOST_USED,
+                  ),
+                  DropdownOption(
+                    title = stringResource(R.string.sort_recently_used),
+                    icon = Icons.Filled.History,
+                    value = SortAttribute.RECENTLY_USED,
+                  ),
                 ),
-              ),
-            onValueChange = { onSortChange(it) },
-          )
+              onValueChange = { onSortChange(it) },
+            )
+          }
         },
       )
     },
     floatingActionButton = {
-      ExtendedFloatingActionButton(
-        onClick = { showCardCreateSheet = true },
-        text = { Text(stringResource(R.string.cards_new)) },
-        icon = {
-          Icon(Icons.Filled.AddCard, contentDescription = stringResource(R.string.cards_new))
+      FloatingActionButtonMenu(
+        expanded = showCardCreateSheet,
+        button = {
+          ExtendedFloatingActionButton(
+            onClick = { showCardCreateSheet = !showCardCreateSheet },
+            text = { Text(stringResource(R.string.cards_new)) },
+            expanded = !showCardCreateSheet,
+            icon = {
+              Icon(
+                imageVector =
+                  if (!showCardCreateSheet) {
+                    Icons.Filled.AddCard
+                  } else {
+                    Icons.Filled.Close
+                  },
+                contentDescription = stringResource(R.string.cards_new),
+              )
+            },
+          )
         },
-      )
+      ) {
+        FloatingActionButtonMenuItem(
+          onClick = {
+            showBarcodeScanner = true
+            showCardCreateSheet = false
+          },
+          text = { Text(stringResource(R.string.scan_barcode)) },
+          icon = { Icon(Icons.Outlined.QrCodeScanner, contentDescription = null) },
+          containerColor = MaterialTheme.colorScheme.primary,
+          contentColor = MaterialTheme.colorScheme.onPrimary,
+        )
+        FloatingActionButtonMenuItem(
+          onClick = {
+            showPkpassPicker = true
+            showCardCreateSheet = false
+          },
+          text = { Text(stringResource(R.string.card_create_pkpass)) },
+          icon = { Icon(Icons.Outlined.FileOpen, contentDescription = null) },
+          containerColor = MaterialTheme.colorScheme.primary,
+          contentColor = MaterialTheme.colorScheme.onPrimary,
+        )
+        FloatingActionButtonMenuItem(
+          onClick = {
+            onCreateCard(null, null)
+            showCardCreateSheet = false
+          },
+          text = { Text(stringResource(R.string.card_create_manual)) },
+          icon = { Icon(Icons.Filled.Edit, contentDescription = null) },
+          containerColor = MaterialTheme.colorScheme.primary,
+          contentColor = MaterialTheme.colorScheme.onPrimary,
+        )
+      }
     },
   ) { innerPadding ->
     Column(modifier = Modifier.padding(innerPadding).padding(horizontal = 8.dp)) {
@@ -369,41 +442,6 @@ fun CardListScreenComponent(
         }
       }
 
-      if (showCardCreateSheet) {
-        ModalBottomSheet(
-          sheetState = cardCreateSheetState,
-          dragHandle = {},
-          onDismissRequest = { showCardCreateSheet = false },
-        ) {
-          OptionSheet(
-            Option(
-              label = stringResource(R.string.scan_barcode),
-              icon = Icons.Outlined.QrCodeScanner,
-              onClick = {
-                showBarcodeScanner = true
-                showCardCreateSheet = false
-              },
-            ),
-            Option(
-              label = stringResource(R.string.card_create_pkpass),
-              icon = Icons.Outlined.FileOpen,
-              onClick = {
-                showPkpassPicker = true
-                showCardCreateSheet = false
-              },
-            ),
-            Option(
-              label = stringResource(R.string.card_create_manual),
-              icon = Icons.Filled.Edit,
-              onClick = {
-                onCreateCard(null, null)
-                showCardCreateSheet = false
-              },
-            ),
-          )
-        }
-      }
-
       openDeleteDialog?.let {
         ConfirmDialog(
           onDismissRequest = { openDeleteDialog = null },
@@ -447,8 +485,8 @@ fun CardListScreenComponent(
   }
 }
 
-@Preview
-@Preview(device = "id:pixel_tablet")
+@Preview(showSystemUi = true)
+@Preview(device = "id:pixel_tablet", showSystemUi = true)
 @Composable
 fun PreviewCardListScreenComponent() {
   CardListScreenComponent(
@@ -466,8 +504,8 @@ fun PreviewCardListScreenComponent() {
   )
 }
 
-@Preview
-@Preview(device = "id:pixel_tablet")
+@Preview(showSystemUi = true)
+@Preview(device = "id:pixel_tablet", showSystemUi = true)
 @Composable
 fun PreviewCardListScreenComponentEmpty() {
   CardListScreenComponent(
diff --git a/app/src/main/java/de/pawcode/cardstore/ui/screens/EditCardScreen.kt b/app/src/main/java/de/pawcode/cardstore/ui/screens/EditCardScreen.kt
index b74ced8..631c36a 100644
--- a/app/src/main/java/de/pawcode/cardstore/ui/screens/EditCardScreen.kt
+++ b/app/src/main/java/de/pawcode/cardstore/ui/screens/EditCardScreen.kt
@@ -153,6 +153,7 @@ fun EditCardScreenComponent(
     topBar = {
       AppBar(
         title = stringResource(if (!isCreateCard) R.string.card_edit else R.string.card_add),
+        subtitle = if (!isCreateCard) initialCard.card.storeName else null,
         onBack = { handleBack() },
       )
     },
@@ -179,8 +180,8 @@ fun EditCardScreenComponent(
   }
 }
 
-@Preview
-@Preview(device = "id:pixel_tablet")
+@Preview(showSystemUi = true)
+@Preview(device = "id:pixel_tablet", showSystemUi = true)
 @Composable
 fun PreviewEditCardScreenComponent() {
   EditCardScreenComponent(
@@ -192,8 +193,8 @@ fun PreviewEditCardScreenComponent() {
   )
 }
 
-@Preview
-@Preview(device = "id:pixel_tablet")
+@Preview(showSystemUi = true)
+@Preview(device = "id:pixel_tablet", showSystemUi = true)
 @Composable
 fun PreviewEditCardScreenComponentEmpty() {
   EditCardScreenComponent(
diff --git a/app/src/main/java/de/pawcode/cardstore/ui/screens/EditLabelScreen.kt b/app/src/main/java/de/pawcode/cardstore/ui/screens/EditLabelScreen.kt
index 1c32805..5d95e96 100644
--- a/app/src/main/java/de/pawcode/cardstore/ui/screens/EditLabelScreen.kt
+++ b/app/src/main/java/de/pawcode/cardstore/ui/screens/EditLabelScreen.kt
@@ -130,6 +130,7 @@ fun EditLabelScreenComponent(
     topBar = {
       AppBar(
         title = stringResource(if (!isCreateLabel) R.string.label_edit else R.string.label_add),
+        subtitle = initialLabel.name,
         onBack = { handleBack() },
       )
     },
@@ -187,8 +188,8 @@ fun EditLabelScreenComponent(
   }
 }
 
-@Preview
-@Preview(device = "id:pixel_tablet")
+@Preview(showSystemUi = true)
+@Preview(device = "id:pixel_tablet", showSystemUi = true)
 @Composable
 fun PreviewEditLabelScreenComponent() {
   EditLabelScreenComponent(
@@ -199,8 +200,8 @@ fun PreviewEditLabelScreenComponent() {
   )
 }
 
-@Preview
-@Preview(device = "id:pixel_tablet")
+@Preview(showSystemUi = true)
+@Preview(device = "id:pixel_tablet", showSystemUi = true)
 @Composable
 fun PreviewEditLabelScreenComponentEmpty() {
   EditLabelScreenComponent(
diff --git a/app/src/main/java/de/pawcode/cardstore/ui/theme/Theme.kt b/app/src/main/java/de/pawcode/cardstore/ui/theme/Theme.kt
index b55aeb8..ea128a5 100644
--- a/app/src/main/java/de/pawcode/cardstore/ui/theme/Theme.kt
+++ b/app/src/main/java/de/pawcode/cardstore/ui/theme/Theme.kt
@@ -1,20 +1,17 @@
 package de.pawcode.cardstore.ui.theme
 
 import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.MaterialExpressiveTheme
+import androidx.compose.material3.MotionScheme
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.material3.dynamicLightColorScheme
-import androidx.compose.material3.lightColorScheme
+import androidx.compose.material3.expressiveLightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 
-private val DarkColorScheme =
-  darkColorScheme(primary = Purple80, secondary = PurpleGrey80, tertiary = Pink80)
-
-private val LightColorScheme =
-  lightColorScheme(primary = Purple40, secondary = PurpleGrey40, tertiary = Pink40)
-
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 fun CardStoreTheme(
   darkTheme: Boolean = isSystemInDarkTheme(),
@@ -28,9 +25,14 @@ fun CardStoreTheme(
         if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
       }
 
-      darkTheme -> DarkColorScheme
-      else -> LightColorScheme
+      darkTheme -> darkColorScheme()
+      else -> expressiveLightColorScheme()
     }
 
-  MaterialTheme(colorScheme = colorScheme, typography = Typography, content = content)
+  MaterialExpressiveTheme(
+    colorScheme = colorScheme,
+    typography = Typography,
+    motionScheme = MotionScheme.expressive(),
+    content = content,
+  )
 }
diff --git a/app/src/main/res/drawable/github_mark.xml b/app/src/main/res/drawable/github_mark.xml
new file mode 100644
index 0000000..34241ea
--- /dev/null
+++ b/app/src/main/res/drawable/github_mark.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="98dp"
+    android:height="96dp"
+    android:viewportWidth="98"
+    android:viewportHeight="96">
+  <path
+      android:pathData="M48.854,0C21.839,0 0,22 0,49.217c0,21.756 13.993,40.172 33.405,46.69 2.427,0.49 3.316,-1.059 3.316,-2.362 0,-1.141 -0.08,-5.052 -0.08,-9.127 -13.59,2.934 -16.42,-5.867 -16.42,-5.867 -2.184,-5.704 -5.42,-7.17 -5.42,-7.17 -4.448,-3.015 0.324,-3.015 0.324,-3.015 4.934,0.326 7.523,5.052 7.523,5.052 4.367,7.496 11.404,5.378 14.235,4.074 0.404,-3.178 1.699,-5.378 3.074,-6.6 -10.839,-1.141 -22.243,-5.378 -22.243,-24.283 0,-5.378 1.94,-9.778 5.014,-13.2 -0.485,-1.222 -2.184,-6.275 0.486,-13.038 0,0 4.125,-1.304 13.426,5.052a46.97,46.97 0,0 1,12.214 -1.63c4.125,0 8.33,0.571 12.213,1.63 9.302,-6.356 13.427,-5.052 13.427,-5.052 2.67,6.763 0.97,11.816 0.485,13.038 3.155,3.422 5.015,7.822 5.015,13.2 0,18.905 -11.404,23.06 -22.324,24.283 1.78,1.548 3.316,4.481 3.316,9.126 0,6.6 -0.08,11.897 -0.08,13.526 0,1.304 0.89,2.853 3.316,2.364 19.412,-6.52 33.405,-24.935 33.405,-46.691C97.707,22 75.788,0 48.854,0z"
+      android:fillColor="#24292f"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/google_play.xml b/app/src/main/res/drawable/google_play.xml
new file mode 100644
index 0000000..0ae23c0
--- /dev/null
+++ b/app/src/main/res/drawable/google_play.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="800dp"
+    android:height="800dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+  <path
+      android:pathData="M48,59.49v393a4.33,4.33 0,0 0,7.37 3.07L260,256 55.37,56.42A4.33,4.33 0,0 0,48 59.49Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M345.8,174 L89.22,32.64l-0.16,-0.09c-4.42,-2.4 -8.62,3.58 -5,7.06L285.19,231.93Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M84.08,472.39c-3.64,3.48 0.56,9.46 5,7.06l0.16,-0.09L345.8,338l-60.61,-57.95Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M449.38,231l-71.65,-39.46L310.36,256l67.37,64.43L449.38,281C468.87,270.23 468.87,241.77 449.38,231Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/icon.xml b/app/src/main/res/drawable/icon.xml
new file mode 100644
index 0000000..26920eb
--- /dev/null
+++ b/app/src/main/res/drawable/icon.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="200"
+    android:viewportHeight="200">
+  <path
+      android:pathData="M106.13,33.94c0,-21.16 8.49,-26.66 17.51,-23.17 9.46,3.67 17.32,13.82 17.32,26.61s-7.65,19.72 -17.32,19.72c-9.67,0 -17.51,-2.2 -17.51,-23.17M76.36,57.1c9.67,0 17.51,-2.2 17.51,-23.17 0,-21.16 -8.49,-26.66 -17.51,-23.17 -9.46,3.67 -17.32,13.82 -17.32,26.61s7.65,19.72 17.32,19.72m91.44,-17.96c-12.76,4.05 -18.73,16.28 -19.97,23.53 -1.89,11.12 7.17,17.32 15.69,17.32s13.02,-5.82 15.21,-16.89c1.98,-10.06 -2.04,-26.78 -10.93,-23.96M52.16,62.67c-1.23,-7.25 -7.2,-19.48 -19.97,-23.53 -8.89,-2.82 -12.92,13.91 -10.93,23.96 2.18,11.07 6.68,16.89 15.2,16.89S54.05,73.79 52.16,62.67m24.88,36.96c15.68,-13.59 39.4,-11.9 52.99,3.78l18.59,-16.14a62.2,62.2 0,0 0,-46.99 -21.44c-34.34,0.01 -62.18,27.86 -62.17,62.2s27.86,62.18 62.2,62.17a62.17,62.17 0,0 0,46.96 -21.44l-18.59,-16.14a37.6,37.6 0,0 1,-3.78 3.78c-15.68,13.59 -39.4,11.9 -52.99,-3.78 -13.59,-15.68 -11.9,-39.4 3.78,-52.99">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="28.19"
+          android:startY="66.51"
+          android:endX="171.81"
+          android:endY="133.49"
+          android:type="linear">
+        <item android:offset="0.06" android:color="#FF38BDF8"/>
+        <item android:offset="0.86" android:color="#FF8B5CF6"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
diff --git a/app/src/main/res/drawable/pawcode_dark.xml b/app/src/main/res/drawable/pawcode_dark.xml
new file mode 100644
index 0000000..1e99efc
--- /dev/null
+++ b/app/src/main/res/drawable/pawcode_dark.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+xmlns:aapt="http://schemas.android.com/aapt"
+android:width="200dp"
+android:height="80dp"
+android:viewportWidth="200"
+android:viewportHeight="80">
+<group
+    android:translateY="17.5">
+  <path
+      android:pathData="m107.82,4.93c0,-4.32 1.76,-5.44 3.64,-4.73 1.97,0.75 3.6,2.82 3.6,5.43 0,2.61 -1.59,4.03 -3.6,4.03 -2.01,0 -3.64,-0.45 -3.64,-4.73m-6.18,4.73c2.01,0 3.64,-0.45 3.64,-4.73 0,-4.32 -1.76,-5.44 -3.64,-4.73 -1.97,0.75 -3.6,2.82 -3.6,5.43 0,2.61 1.59,4.03 3.6,4.03m19,-3.67c-2.65,0.83 -3.89,3.32 -4.15,4.8 -0.39,2.27 1.49,3.54 3.26,3.54 1.77,0 2.71,-1.19 3.16,-3.45 0.41,-2.05 -0.42,-5.47 -2.27,-4.89m-24.02,4.8c-0.26,-1.48 -1.5,-3.98 -4.15,-4.8 -1.85,-0.58 -2.68,2.84 -2.27,4.89 0.45,2.26 1.39,3.45 3.16,3.45 1.77,0 3.65,-1.27 3.26,-3.54m5.17,7.55c3.26,-2.77 8.19,-2.43 11.01,0.77L116.64,15.82A12.7,12.92 90,0 0,106.88 11.44c-7.13,0 -12.92,5.69 -12.91,12.7 0,7.01 5.79,12.7 12.92,12.69a12.69,12.92 90,0 0,9.75 -4.38l-3.86,-3.3a7.67,7.81 90,0 1,-0.78 0.77c-3.26,2.77 -8.19,2.43 -11.01,-0.77 -2.82,-3.2 -2.47,-8.04 0.78,-10.82">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="91.62"
+          android:startY="11.58"
+          android:endX="121.46"
+          android:endY="25.25"
+          android:type="linear">
+        <item android:offset="0.06" android:color="#FF38BDF8"/>
+        <item android:offset="0.86" android:color="#FF8B5CF6"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="m145.48,24.22a15.56,15.83 90,0 1,-0.84 5.2,11.51 11.71,90 0,1 -2.39,4 10.56,10.74 90,0 1,-3.72 2.58,11.83 12.03,90 0,1 -4.8,0.92 11.65,11.86 90,0 1,-4.78 -0.92,10.61 10.8,90 0,1 -3.7,-2.58 11.8,12.01 90,0 1,-2.41 -4,15.13 15.4,90 0,1 -0.87,-5.2 14.95,15.21 90,0 1,0.87 -5.18,11.64 11.84,90 0,1 2.44,-3.98 10.58,10.77 90,0 1,3.72 -2.56,11.8 12.01,90 0,1 4.73,-0.9 11.96,12.17 90,0 1,4.75 0.9,10.29 10.47,90 0,1 3.72,2.56 11.85,12.06 90,0 1,2.41 3.98,14.98 15.24,90 0,1 0.87,5.18m-5.81,0q0,-3.59 -1.57,-5.69 -1.57,-2.09 -4.38,-2.09 -2.81,0 -4.38,2.09 -1.57,2.1 -1.57,5.69 0,3.64 1.57,5.75 1.57,2.12 4.38,2.12 2.81,0 4.38,-2.12 1.57,-2.12 1.57,-5.75zM172.04,35.55a32.81,33.38 90,0 1,-4.24 0.92,32.28 32.84,90 0,1 -5.36,0.41 14.05,14.29 90,0 1,-5.2 -0.87,10.64 10.82,90 0,1 -3.91,-2.51 11.03,11.23 90,0 1,-2.48 -3.96,15.08 15.34,90 0,1 -0.87,-5.23 17.59,17.9 90,0 1,0.73 -5.18,11.32 11.52,90 0,1 2.13,-3.98 9.34,9.5 90,0 1,3.42 -2.56,10.93 11.12,90 0,1 4.64,-0.9 10.42,10.61 90,0 1,3.14 0.41,13.76 14,90 0,1 2.34,0.92L166.37,1.48l5.67,-0.92zM155.78,24.18q0,3.68 1.78,5.78 1.78,2.1 4.92,2.09a19.05,19.38 90,0 0,2.32 -0.12,15.35 15.61,90 0,0 1.57,-0.25l0,-13.81a8.68,8.83 90,0 0,-1.99 -0.94,7.65 7.78,90 0,0 -2.65,-0.44q-3.09,0 -4.52,2.07 -1.43,2.07 -1.43,5.62m22.11,0.18a15.13,15.4 90,0 1,0.96 -5.57,11.69 11.9,90 0,1 2.55,-3.98 10.37,10.55 90,0 1,3.65 -2.39,11.14 11.33,90 0,1 4.22,-0.81q5.06,0 7.89,3.08 2.83,3.09 2.83,9.21 0,0.46 -0.02,1.04a18.26,18.58 90,0 1,-0.07 1.04l-16.16,0q0.23,2.9 2.08,4.49 1.85,1.59 5.36,1.59a17.3,17.61 90,0 0,3.77 -0.37,15.24 15.51,90 0,0 2.69,-0.78l0.75,4.56a8.84,8.99 90,0 1,-1.29 0.48,17.73 18.04,90 0,1 -1.87,0.46q-1.05,0.21 -2.27,0.35c-0.82,0.09 -1.65,0.14 -2.48,0.14a14.76,15.02 90,0 1,-5.62 -0.94,10.28 10.46,90 0,1 -3.93,-2.62 10.74,10.93 90,0 1,-2.3 -3.96,16.17 16.45,90 0,1 -0.75,-5m16.44,-2.49a7.33,7.46 90,0 0,-0.33 -2.19,5.27 5.36,90 0,0 -0.96,-1.8 4.47,4.55 90,0 0,-1.55 -1.2,4.84 4.93,90 0,0 -2.18,-0.44 4.97,5.06 90,0 0,-2.29 0.48,5.13 5.22,90 0,0 -1.66,1.27 5.79,5.9 90,0 0,-1.05 1.8,9.68 9.85,90 0,0 -0.52,2.07zM22.57,24.14c0.02,1.75 -0.23,3.5 -0.74,5.18a12.09,12.3 90,0 1,-2.13 4.05,9.31 9.48,90 0,1 -3.47,2.64 11.17,10.98 0,0 1,-4.72 0.94,11.46 11.66,90 0,1 -3.26,-0.42 12.11,11.91 0,0 1,-2.44 -0.94l0,9.56L0,45.14L0,12.6q1.77,-0.47 4.36,-0.89a32.65,33.22 90,0 1,5.46 -0.42,14.39 14.64,90 0,1 5.32,0.89 10.9,11.09 90,0 1,4 2.57,11.32 11.52,90 0,1 2.54,4.05 15.75,15.48 0,0 1,0.89 5.35m-5.94,0.09q0,-3.81 -1.75,-5.93 -1.75,-2.12 -5.63,-2.12 -0.82,0 -1.7,0.07c-0.59,0.05 -1.18,0.15 -1.75,0.31l0,14.08a8.78,8.94 90,0 0,2.04 0.97,7.81 7.94,90 0,0 2.71,0.45q3.16,0 4.62,-2.12 1.46,-2.12 1.46,-5.7M36.9,11.19q2.88,0 4.84,0.71a7.59,7.73 90,0 1,3.14 1.98,7.41 7.54,90 0,1 1.68,3.09 15.08,15.34 90,0 1,0.5 3.98l0,14.93q-1.34,0.28 -4.05,0.68a41.46,40.75 0,0 1,-6.11 0.4,17.99 18.31,90 0,1 -4.12,-0.42 8.51,8.65 90,0 1,-3.19 -1.37,6.43 6.54,90 0,1 -2.06,-2.45 8.49,8.64 90,0 1,-0.74 -3.72,7.18 7.31,90 0,1 0.84,-3.58 6.76,6.88 90,0 1,2.28 -2.38,9.68 9.85,90 0,1 3.33,-1.32 18.47,18.79 90,0 1,3.95 -0.4c0.67,0 1.34,0.04 2.01,0.12 0.76,0.09 1.51,0.22 2.25,0.4l0,-0.94a7.41,7.54 90,0 0,-0.24 -1.88,3.92 3.98,90 0,0 -0.84,-1.58 3.87,3.94 90,0 0,-1.58 -1.06,6.75 6.86,90 0,0 -2.47,-0.38 21.43,21.81 90,0 0,-3.69 0.28,15.87 16.15,90 0,0 -2.73,0.66L29.18,12.32a22.49,22.88 90,0 1,3.21 -0.75,24.76 25.2,90 0,1 4.5,-0.38m0.48,21.24a21.17,21.54 90,0 0,4.07 -0.28L41.45,25.83a11.11,11.31 90,0 0,-1.39 -0.28,12.7 12.92,90 0,0 -2.01,-0.14 13.23,13.46 90,0 0,-1.94 0.14,5.95 6.06,90 0,0 -1.77,0.52 3.16,3.22 90,0 0,-1.27 1.06,2.96 3.02,90 0,0 -0.48,1.72q0,2.03 1.29,2.8 1.29,0.78 3.5,0.78zM68.64,20.94a163.25,166.1 90,0 1,-2.37 8.08,258.5 263.01,90 0,1 -2.51,7.42l-4.76,0q-0.96,-2.17 -2.02,-4.95 -1.06,-2.78 -2.11,-5.93a246.33,250.63 90,0 1,-2.11 -6.64q-1.06,-3.48 -2.06,-7.11l6.14,0a139.96,142.41 90,0 0,1.01 4.26,478.63 486.99,90 0,0 1.2,4.66 151.61,154.25 90,0 0,1.3 4.64q0.67,2.26 1.35,4.14A171.98,174.98 90,0 0,64.43 20.42q0.62,-2.31 1.18,-4.5a162.06,159.28 0,0 0,0.98 -4.12l4.46,0a259.29,263.82 90,0 0,0.96 4.12,265.91 270.55,90 0,0 1.12,4.5 127.87,125.68 0,0 0,1.29 4.61,167.75 170.67,90 0,0 1.41,4.47 143.4,145.91 90,0 0,1.3 -4.14,219.4 215.64,0 0,0 1.32,-4.64q0.65,-2.38 1.23,-4.66a141.02,143.49 90,0 0,1.01 -4.26l5.99,0a325.44,331.12 90,0 1,-2.06 7.11,242.89 247.13,90 0,1 -2.11,6.64q-1.06,3.16 -2.11,5.93 -1.06,2.78 -2.06,4.95l-4.71,0a395.82,402.73 90,0 1,-2.56 -7.42,134.41 136.76,90 0,1 -2.42,-8.08"
+      android:fillColor="#000000"/>
+</group>
+</vector>
diff --git a/app/src/main/res/drawable/pawcode_light.xml b/app/src/main/res/drawable/pawcode_light.xml
index e0a65dc..680ae15 100644
--- a/app/src/main/res/drawable/pawcode_light.xml
+++ b/app/src/main/res/drawable/pawcode_light.xml
@@ -1,39 +1,27 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="200dp"
     android:height="80dp"
     android:viewportWidth="200"
     android:viewportHeight="80">
-    <path
-        android:fillColor="#4472c4"
-        android:pathData="m115.05,23.06c0,2.61 -1.59,4.03 -3.6,4.03 -2.01,0 -3.64,-0.45 -3.64,-4.73 0,-4.32 1.76,-5.44 3.64,-4.73 1.97,0.75 3.6,2.82 3.6,5.43z" />
-    <path
-        android:fillColor="#4472c4"
-        android:pathData="m98.04,23.06c0,2.61 1.59,4.03 3.6,4.03 2.01,0 3.64,-0.45 3.64,-4.73 0,-4.32 -1.76,-5.44 -3.64,-4.73 -1.97,0.75 -3.6,2.82 -3.6,5.43z" />
-    <path
-        android:fillColor="#4472c4"
-        android:pathData="m122.9,28.31c-0.45,2.26 -1.39,3.45 -3.16,3.45 -1.77,0 -3.65,-1.27 -3.26,-3.54 0.26,-1.48 1.5,-3.98 4.15,-4.8 1.85,-0.58 2.68,2.84 2.27,4.89z" />
-    <path
-        android:fillColor="#4472c4"
-        android:pathData="m90.18,28.31c0.45,2.26 1.39,3.45 3.16,3.45 1.77,0 3.65,-1.27 3.26,-3.54 -0.26,-1.48 -1.5,-3.98 -4.15,-4.8 -1.85,-0.58 -2.68,2.84 -2.27,4.89z" />
-    <path
-        android:fillColor="#4472c4"
-        android:pathData="m106.89,54.26a12.7,12.92 90,1 1,9.75 -21.02l-3.86,3.3a7.67,7.8 90,1 0,0 10.05l3.86,3.3a12.69,12.92 90,0 1,-9.75 4.38z" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="m145.48,41.65a15.54,15.81 90,0 1,-0.84 5.2,11.51 11.71,90 0,1 -2.39,4.01 10.56,10.74 90,0 1,-3.72 2.58,11.82 12.03,90 0,1 -4.8,0.92 11.65,11.86 90,0 1,-4.78 -0.92,10.61 10.79,90 0,1 -3.7,-2.58 11.79,12 90,0 1,-2.41 -4.01,15.15 15.41,90 0,1 -0.87,-5.2 14.95,15.22 90,0 1,0.87 -5.18,11.64 11.84,90 0,1 2.44,-3.98 10.57,10.76 90,0 1,3.72 -2.56,11.79 12,90 0,1 4.73,-0.9 11.96,12.17 90,0 1,4.75 0.9,10.3 10.48,90 0,1 3.72,2.56 11.86,12.06 90,0 1,2.41 3.98,14.98 15.24,90 0,1 0.87,5.18zM139.67,41.65q0,-3.59 -1.57,-5.69 -1.57,-2.09 -4.38,-2.09 -2.81,0 -4.38,2.09 -1.57,2.1 -1.57,5.69 0,3.64 1.57,5.75 1.57,2.12 4.38,2.12 2.81,-0 4.38,-2.12 1.57,-2.12 1.57,-5.75z" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="m172.04,52.98a32.89,33.46 90,0 1,-4.24 0.92,32.33 32.9,90 0,1 -5.36,0.41 14.05,14.3 90,0 1,-5.2 -0.87,10.63 10.82,90 0,1 -3.91,-2.51 11.04,11.23 90,0 1,-2.48 -3.96,15.09 15.36,90 0,1 -0.87,-5.23 17.6,17.9 90,0 1,0.73 -5.18,11.33 11.53,90 0,1 2.13,-3.98 9.34,9.5 90,0 1,3.42 -2.56,10.93 11.12,90 0,1 4.64,-0.9 10.42,10.61 90,0 1,3.14 0.41,13.82 14.06,90 0,1 2.34,0.92L166.37,18.91l5.67,-0.92zM155.78,41.61q0,3.68 1.78,5.78 1.78,2.1 4.92,2.09a19.15,19.49 90,0 0,2.32 -0.12,15.2 15.47,90 0,0 1.57,-0.25L166.37,35.3a8.67,8.82 90,0 0,-1.99 -0.94,7.65 7.79,90 0,0 -2.65,-0.44q-3.09,0 -4.52,2.07 -1.43,2.07 -1.43,5.62z" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="m177.89,41.79a15.12,15.39 90,0 1,0.96 -5.57,11.69 11.89,90 0,1 2.55,-3.98 10.38,10.56 90,0 1,3.65 -2.39,11.13 11.32,90 0,1 4.22,-0.81q5.06,0 7.89,3.08 2.83,3.09 2.83,9.21 0,0.46 -0.02,1.04 -0.02,0.58 -0.07,1.04l-16.16,0q0.23,2.9 2.08,4.49 1.85,1.59 5.36,1.59a17.29,17.6 90,0 0,3.77 -0.37,15.25 15.52,90 0,0 2.69,-0.78l0.75,4.56a8.85,9 90,0 1,-1.29 0.48,17.84 18.15,90 0,1 -1.87,0.46q-1.05,0.21 -2.27,0.35a21.3,21.67 90,0 1,-2.48 0.14,14.78 15.03,90 0,1 -5.62,-0.94 10.28,10.46 90,0 1,-3.93 -2.62,10.75 10.94,90 0,1 -2.3,-3.96 16.16,16.44 90,0 1,-0.75 -5zM194.33,39.3a7.33,7.46 90,0 0,-0.33 -2.19,5.27 5.37,90 0,0 -0.96,-1.8 4.47,4.55 90,0 0,-1.55 -1.2,4.85 4.93,90 0,0 -2.18,-0.44 4.98,5.07 90,0 0,-2.3 0.48,5.14 5.23,90 0,0 -1.66,1.27 5.78,5.89 90,0 0,-1.05 1.8,9.68 9.85,90 0,0 -0.52,2.07z" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="m22.57,41.57a17.44,17.75 90,0 1,-0.74 5.18,12.09 12.3,90 0,1 -2.13,4.05 9.31,9.47 90,0 1,-3.47 2.64,10.99 11.18,90 0,1 -4.72,0.94 11.46,11.66 90,0 1,-3.26 -0.42,11.92 12.13,90 0,1 -2.44,-0.94l0,9.56L0,62.57L0,30.03q1.77,-0.47 4.36,-0.89a32.66,33.23 90,0 1,5.46 -0.42,14.38 14.63,90 0,1 5.32,0.89 10.91,11.1 90,0 1,4 2.57,11.32 11.51,90 0,1 2.54,4.05 15.47,15.74 90,0 1,0.89 5.35zM16.63,41.66q0,-3.81 -1.75,-5.93 -1.75,-2.12 -5.63,-2.12 -0.82,0 -1.7,0.07a9.22,9.38 90,0 0,-1.75 0.31l0,14.08a8.78,8.93 90,0 0,2.04 0.97,7.82 7.95,90 0,0 2.71,0.45q3.16,0 4.62,-2.12 1.46,-2.12 1.46,-5.7z" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="m36.9,28.62q2.88,0 4.84,0.71a7.6,7.73 90,0 1,3.14 1.98,7.42 7.55,90 0,1 1.68,3.08 15.1,15.36 90,0 1,0.5 3.98l0,14.93q-1.34,0.28 -4.05,0.68a40.71,41.42 90,0 1,-6.11 0.4,18.03 18.35,90 0,1 -4.12,-0.42 8.51,8.65 90,0 1,-3.19 -1.37,6.43 6.55,90 0,1 -2.06,-2.45 8.49,8.64 90,0 1,-0.74 -3.72,7.18 7.31,90 0,1 0.84,-3.58 6.76,6.88 90,0 1,2.28 -2.38,9.68 9.85,90 0,1 3.33,-1.32 18.46,18.78 90,0 1,3.95 -0.4,17.65 17.96,90 0,1 2.01,0.12 18.54,18.86 90,0 1,2.25 0.4l0,-0.94a7.39,7.52 90,0 0,-0.24 -1.88,3.92 3.99,90 0,0 -0.84,-1.58 3.87,3.94 90,0 0,-1.58 -1.06,6.73 6.85,90 0,0 -2.47,-0.38A21.5,21.87 90,0 0,32.63 33.7,15.94 16.22,90 0,0 29.9,34.36L29.18,29.75a22.51,22.91 90,0 1,3.21 -0.75,24.76 25.2,90 0,1 4.5,-0.38zM37.38,49.86a21.21,21.58 90,0 0,4.07 -0.28L41.45,43.26a11.12,11.31 90,0 0,-1.39 -0.28,12.76 12.98,90 0,0 -2.01,-0.14 13.17,13.4 90,0 0,-1.94 0.14,5.95 6.06,90 0,0 -1.77,0.52 3.16,3.22 90,0 0,-1.27 1.06,2.96 3.01,90 0,0 -0.48,1.72q0,2.03 1.29,2.8 1.29,0.78 3.5,0.78z" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="m68.64,38.36q-1.1,4.14 -2.37,8.08 -1.27,3.93 -2.51,7.42l-4.76,0q-0.96,-2.17 -2.02,-4.95 -1.06,-2.78 -2.11,-5.93 -1.06,-3.15 -2.11,-6.64 -1.06,-3.48 -2.06,-7.11l6.14,0q0.43,1.98 1.01,4.26 0.58,2.29 1.2,4.66 0.63,2.38 1.3,4.64 0.67,2.26 1.35,4.14 0.72,-2.17 1.42,-4.47 0.7,-2.31 1.32,-4.62 0.62,-2.31 1.18,-4.5 0.55,-2.19 0.98,-4.12l4.46,0q0.43,1.93 0.96,4.12 0.53,2.19 1.12,4.5 0.6,2.31 1.29,4.62 0.69,2.31 1.41,4.47 0.63,-1.88 1.3,-4.14 0.67,-2.26 1.32,-4.64 0.65,-2.38 1.23,-4.66 0.58,-2.28 1.01,-4.26l5.99,0q-1.01,3.63 -2.06,7.11 -1.06,3.49 -2.11,6.64 -1.06,3.16 -2.11,5.93 -1.06,2.78 -2.06,4.95l-4.71,0q-1.24,-3.48 -2.56,-7.42 -1.32,-3.93 -2.42,-8.08z" />
+  <group
+      android:translateY="17.5">
+  <path
+      android:pathData="m107.82,4.93c0,-4.32 1.76,-5.44 3.64,-4.73 1.97,0.75 3.6,2.82 3.6,5.43 0,2.61 -1.59,4.03 -3.6,4.03 -2.01,0 -3.64,-0.45 -3.64,-4.73m-6.18,4.73c2.01,0 3.64,-0.45 3.64,-4.73 0,-4.32 -1.76,-5.44 -3.64,-4.73 -1.97,0.75 -3.6,2.82 -3.6,5.43 0,2.61 1.59,4.03 3.6,4.03m19,-3.67c-2.65,0.83 -3.89,3.32 -4.15,4.8 -0.39,2.27 1.49,3.54 3.26,3.54 1.77,0 2.71,-1.19 3.16,-3.45 0.41,-2.05 -0.42,-5.47 -2.27,-4.89m-24.02,4.8c-0.26,-1.48 -1.5,-3.98 -4.15,-4.8 -1.85,-0.58 -2.68,2.84 -2.27,4.89 0.45,2.26 1.39,3.45 3.16,3.45 1.77,0 3.65,-1.27 3.26,-3.54m5.17,7.55c3.26,-2.77 8.19,-2.43 11.01,0.77L116.64,15.82A12.7,12.92 90,0 0,106.88 11.44c-7.13,0 -12.92,5.69 -12.91,12.7 0,7.01 5.79,12.7 12.92,12.69a12.69,12.92 90,0 0,9.75 -4.38l-3.86,-3.3a7.67,7.81 90,0 1,-0.78 0.77c-3.26,2.77 -8.19,2.43 -11.01,-0.77 -2.82,-3.2 -2.47,-8.04 0.78,-10.82">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="91.62"
+          android:startY="11.58"
+          android:endX="121.46"
+          android:endY="25.25"
+          android:type="linear">
+        <item android:offset="0.06" android:color="#FF38BDF8"/>
+        <item android:offset="0.86" android:color="#FF8B5CF6"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="m145.48,24.22a15.56,15.83 90,0 1,-0.84 5.2,11.51 11.71,90 0,1 -2.39,4 10.56,10.74 90,0 1,-3.72 2.58,11.83 12.03,90 0,1 -4.8,0.92 11.65,11.86 90,0 1,-4.78 -0.92,10.61 10.8,90 0,1 -3.7,-2.58 11.8,12.01 90,0 1,-2.41 -4,15.13 15.4,90 0,1 -0.87,-5.2 14.95,15.21 90,0 1,0.87 -5.18,11.64 11.84,90 0,1 2.44,-3.98 10.58,10.77 90,0 1,3.72 -2.56,11.8 12.01,90 0,1 4.73,-0.9 11.96,12.17 90,0 1,4.75 0.9,10.29 10.47,90 0,1 3.72,2.56 11.85,12.06 90,0 1,2.41 3.98,14.98 15.24,90 0,1 0.87,5.18m-5.81,0q0,-3.59 -1.57,-5.69 -1.57,-2.09 -4.38,-2.09 -2.81,0 -4.38,2.09 -1.57,2.1 -1.57,5.69 0,3.64 1.57,5.75 1.57,2.12 4.38,2.12 2.81,0 4.38,-2.12 1.57,-2.12 1.57,-5.75zM172.04,35.55a32.81,33.38 90,0 1,-4.24 0.92,32.28 32.84,90 0,1 -5.36,0.41 14.05,14.29 90,0 1,-5.2 -0.87,10.64 10.82,90 0,1 -3.91,-2.51 11.03,11.23 90,0 1,-2.48 -3.96,15.08 15.34,90 0,1 -0.87,-5.23 17.59,17.9 90,0 1,0.73 -5.18,11.32 11.52,90 0,1 2.13,-3.98 9.34,9.5 90,0 1,3.42 -2.56,10.93 11.12,90 0,1 4.64,-0.9 10.42,10.61 90,0 1,3.14 0.41,13.76 14,90 0,1 2.34,0.92L166.37,1.48l5.67,-0.92zM155.78,24.18q0,3.68 1.78,5.78 1.78,2.1 4.92,2.09a19.05,19.38 90,0 0,2.32 -0.12,15.35 15.61,90 0,0 1.57,-0.25l0,-13.81a8.68,8.83 90,0 0,-1.99 -0.94,7.65 7.78,90 0,0 -2.65,-0.44q-3.09,0 -4.52,2.07 -1.43,2.07 -1.43,5.62m22.11,0.18a15.13,15.4 90,0 1,0.96 -5.57,11.69 11.9,90 0,1 2.55,-3.98 10.37,10.55 90,0 1,3.65 -2.39,11.14 11.33,90 0,1 4.22,-0.81q5.06,0 7.89,3.08 2.83,3.09 2.83,9.21 0,0.46 -0.02,1.04a18.26,18.58 90,0 1,-0.07 1.04l-16.16,0q0.23,2.9 2.08,4.49 1.85,1.59 5.36,1.59a17.3,17.61 90,0 0,3.77 -0.37,15.24 15.51,90 0,0 2.69,-0.78l0.75,4.56a8.84,8.99 90,0 1,-1.29 0.48,17.73 18.04,90 0,1 -1.87,0.46q-1.05,0.21 -2.27,0.35c-0.82,0.09 -1.65,0.14 -2.48,0.14a14.76,15.02 90,0 1,-5.62 -0.94,10.28 10.46,90 0,1 -3.93,-2.62 10.74,10.93 90,0 1,-2.3 -3.96,16.17 16.45,90 0,1 -0.75,-5m16.44,-2.49a7.33,7.46 90,0 0,-0.33 -2.19,5.27 5.36,90 0,0 -0.96,-1.8 4.47,4.55 90,0 0,-1.55 -1.2,4.84 4.93,90 0,0 -2.18,-0.44 4.97,5.06 90,0 0,-2.29 0.48,5.13 5.22,90 0,0 -1.66,1.27 5.79,5.9 90,0 0,-1.05 1.8,9.68 9.85,90 0,0 -0.52,2.07zM22.57,24.14c0.02,1.75 -0.23,3.5 -0.74,5.18a12.09,12.3 90,0 1,-2.13 4.05,9.31 9.48,90 0,1 -3.47,2.64 11.17,10.98 0,0 1,-4.72 0.94,11.46 11.66,90 0,1 -3.26,-0.42 12.11,11.91 0,0 1,-2.44 -0.94l0,9.56L0,45.14L0,12.6q1.77,-0.47 4.36,-0.89a32.65,33.22 90,0 1,5.46 -0.42,14.39 14.64,90 0,1 5.32,0.89 10.9,11.09 90,0 1,4 2.57,11.32 11.52,90 0,1 2.54,4.05 15.75,15.48 0,0 1,0.89 5.35m-5.94,0.09q0,-3.81 -1.75,-5.93 -1.75,-2.12 -5.63,-2.12 -0.82,0 -1.7,0.07c-0.59,0.05 -1.18,0.15 -1.75,0.31l0,14.08a8.78,8.94 90,0 0,2.04 0.97,7.81 7.94,90 0,0 2.71,0.45q3.16,0 4.62,-2.12 1.46,-2.12 1.46,-5.7M36.9,11.19q2.88,0 4.84,0.71a7.59,7.73 90,0 1,3.14 1.98,7.41 7.54,90 0,1 1.68,3.09 15.08,15.34 90,0 1,0.5 3.98l0,14.93q-1.34,0.28 -4.05,0.68a41.46,40.75 0,0 1,-6.11 0.4,17.99 18.31,90 0,1 -4.12,-0.42 8.51,8.65 90,0 1,-3.19 -1.37,6.43 6.54,90 0,1 -2.06,-2.45 8.49,8.64 90,0 1,-0.74 -3.72,7.18 7.31,90 0,1 0.84,-3.58 6.76,6.88 90,0 1,2.28 -2.38,9.68 9.85,90 0,1 3.33,-1.32 18.47,18.79 90,0 1,3.95 -0.4c0.67,0 1.34,0.04 2.01,0.12 0.76,0.09 1.51,0.22 2.25,0.4l0,-0.94a7.41,7.54 90,0 0,-0.24 -1.88,3.92 3.98,90 0,0 -0.84,-1.58 3.87,3.94 90,0 0,-1.58 -1.06,6.75 6.86,90 0,0 -2.47,-0.38 21.43,21.81 90,0 0,-3.69 0.28,15.87 16.15,90 0,0 -2.73,0.66L29.18,12.32a22.49,22.88 90,0 1,3.21 -0.75,24.76 25.2,90 0,1 4.5,-0.38m0.48,21.24a21.17,21.54 90,0 0,4.07 -0.28L41.45,25.83a11.11,11.31 90,0 0,-1.39 -0.28,12.7 12.92,90 0,0 -2.01,-0.14 13.23,13.46 90,0 0,-1.94 0.14,5.95 6.06,90 0,0 -1.77,0.52 3.16,3.22 90,0 0,-1.27 1.06,2.96 3.02,90 0,0 -0.48,1.72q0,2.03 1.29,2.8 1.29,0.78 3.5,0.78zM68.64,20.94a163.25,166.1 90,0 1,-2.37 8.08,258.5 263.01,90 0,1 -2.51,7.42l-4.76,0q-0.96,-2.17 -2.02,-4.95 -1.06,-2.78 -2.11,-5.93a246.33,250.63 90,0 1,-2.11 -6.64q-1.06,-3.48 -2.06,-7.11l6.14,0a139.96,142.41 90,0 0,1.01 4.26,478.63 486.99,90 0,0 1.2,4.66 151.61,154.25 90,0 0,1.3 4.64q0.67,2.26 1.35,4.14A171.98,174.98 90,0 0,64.43 20.42q0.62,-2.31 1.18,-4.5a162.06,159.28 0,0 0,0.98 -4.12l4.46,0a259.29,263.82 90,0 0,0.96 4.12,265.91 270.55,90 0,0 1.12,4.5 127.87,125.68 0,0 0,1.29 4.61,167.75 170.67,90 0,0 1.41,4.47 143.4,145.91 90,0 0,1.3 -4.14,219.4 215.64,0 0,0 1.32,-4.64q0.65,-2.38 1.23,-4.66a141.02,143.49 90,0 0,1.01 -4.26l5.99,0a325.44,331.12 90,0 1,-2.06 7.11,242.89 247.13,90 0,1 -2.11,6.64q-1.06,3.16 -2.11,5.93 -1.06,2.78 -2.06,4.95l-4.71,0a395.82,402.73 90,0 1,-2.56 -7.42,134.41 136.76,90 0,1 -2.42,-8.08"
+      android:fillColor="#ffffff"/>
+  </group>
 </vector>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4046569..8dce5ff 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,6 +14,7 @@ junitVersion = "1.3.0"
 kotlin = "2.2.20"
 kotlinxSerializationJson = "1.9.0"
 lifecycleRuntimeKtx = "2.9.4"
+material3 = "1.5.0-alpha04"
 materialIconsExtended = "1.7.8"
 navigationCompose = "2.9.5"
 playServicesCodeScanner = "16.1.0"
@@ -31,7 +32,7 @@ androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-co
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
 androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
 androidx-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "materialIconsExtended" }
-androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
+androidx-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" }
 androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" }
 androidx-room-common = { group = "androidx.room", name = "room-common", version.ref = "room" }
 androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }