diff --git a/presentation/src/main/java/org/monogram/presentation/features/auth/components/CodeInputScreen.kt b/presentation/src/main/java/org/monogram/presentation/features/auth/components/CodeInputScreen.kt
index 0345dd56..a16c940e 100644
--- a/presentation/src/main/java/org/monogram/presentation/features/auth/components/CodeInputScreen.kt
+++ b/presentation/src/main/java/org/monogram/presentation/features/auth/components/CodeInputScreen.kt
@@ -312,7 +312,8 @@ fun CodeInputScreen(
                 DropdownMenuItem(
                     text = { Text(stringResource(R.string.paste_action)) },
                     onClick = {
-                        val pastedText = nativeClipboard.primaryClip?.getItemAt(0)?.text?.toString() ?: ""
+                        val pastedText =
+                            nativeClipboard.primaryClip?.getItemAt(0)?.text?.toString() ?: ""
                         val digits = pastedText.filter { it.isDigit() }.take(maxCodeLength)
                         if (digits.isNotEmpty()) {
                             code = digits
@@ -329,7 +330,10 @@ fun CodeInputScreen(
         Spacer(modifier = Modifier.height(middleSpacerHeight))
 
         if (isSubmitting) {
-            LoadingIndicator(modifier = Modifier.size(32.dp))
+            LoadingIndicator(
+                modifier = Modifier.size(32.dp),
+                color = MaterialTheme.colorScheme.primary
+            )
         } else {
             Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
                 Button(
diff --git a/presentation/src/main/java/org/monogram/presentation/features/auth/components/PasswordInputScreen.kt b/presentation/src/main/java/org/monogram/presentation/features/auth/components/PasswordInputScreen.kt
index 09ae0b4a..e2dc183f 100644
--- a/presentation/src/main/java/org/monogram/presentation/features/auth/components/PasswordInputScreen.kt
+++ b/presentation/src/main/java/org/monogram/presentation/features/auth/components/PasswordInputScreen.kt
@@ -427,7 +427,7 @@ private fun PasswordContent(
         if (isSubmitting) {
             LoadingIndicator(
                 modifier = Modifier.size(24.dp),
-                color = MaterialTheme.colorScheme.onPrimary
+                color = MaterialTheme.colorScheme.primary
             )
         } else {
             Text(stringResource(R.string.unlock_button), fontSize = 18.sp, fontWeight = FontWeight.Bold)
diff --git a/presentation/src/main/java/org/monogram/presentation/features/auth/components/PhoneInputScreen.kt b/presentation/src/main/java/org/monogram/presentation/features/auth/components/PhoneInputScreen.kt
index 050bab70..3ee65171 100644
--- a/presentation/src/main/java/org/monogram/presentation/features/auth/components/PhoneInputScreen.kt
+++ b/presentation/src/main/java/org/monogram/presentation/features/auth/components/PhoneInputScreen.kt
@@ -417,7 +417,7 @@ fun PhoneInputScreen(
             if (isSubmitting) {
                 LoadingIndicator(
                     modifier = Modifier.size(24.dp),
-                    color = MaterialTheme.colorScheme.onPrimary
+                    color = MaterialTheme.colorScheme.primary
                 )
             } else {
                 Text(
diff --git a/presentation/src/main/java/org/monogram/presentation/features/chats/currentChat/components/AdvancedCircularRecorderScreen.kt b/presentation/src/main/java/org/monogram/presentation/features/chats/currentChat/components/AdvancedCircularRecorderScreen.kt
index e388b822..948f4cc7 100644
--- a/presentation/src/main/java/org/monogram/presentation/features/chats/currentChat/components/AdvancedCircularRecorderScreen.kt
+++ b/presentation/src/main/java/org/monogram/presentation/features/chats/currentChat/components/AdvancedCircularRecorderScreen.kt
@@ -124,6 +124,7 @@ fun AdvancedCircularRecorderScreen(
     }
 }
 
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @SuppressLint("MissingPermission", "RestrictedApi")
 @Composable
 fun NativeCircularCameraContent(
diff --git a/presentation/src/main/java/org/monogram/presentation/features/chats/currentChat/components/chats/PhotoMessageBubble.kt b/presentation/src/main/java/org/monogram/presentation/features/chats/currentChat/components/chats/PhotoMessageBubble.kt
index 661743f6..272a9c6e 100644
--- a/presentation/src/main/java/org/monogram/presentation/features/chats/currentChat/components/chats/PhotoMessageBubble.kt
+++ b/presentation/src/main/java/org/monogram/presentation/features/chats/currentChat/components/chats/PhotoMessageBubble.kt
@@ -5,7 +5,16 @@ import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.background
 import androidx.compose.foundation.gestures.detectTapGestures
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Download
@@ -14,7 +23,13 @@ import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.LoadingIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clipToBounds
diff --git a/presentation/src/main/java/org/monogram/presentation/features/viewers/YouTubeViewer.kt b/presentation/src/main/java/org/monogram/presentation/features/viewers/YouTubeViewer.kt
index 3677933d..c816874f 100644
--- a/presentation/src/main/java/org/monogram/presentation/features/viewers/YouTubeViewer.kt
+++ b/presentation/src/main/java/org/monogram/presentation/features/viewers/YouTubeViewer.kt
@@ -57,6 +57,7 @@ import java.util.*
 import java.util.regex.Pattern
 import kotlin.math.max
 
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 fun YouTubeViewer(
     videoUrl: String,
diff --git a/presentation/src/main/java/org/monogram/presentation/features/webview/InternalWebView.kt b/presentation/src/main/java/org/monogram/presentation/features/webview/InternalWebView.kt
index ab7772fa..947186b4 100644
--- a/presentation/src/main/java/org/monogram/presentation/features/webview/InternalWebView.kt
+++ b/presentation/src/main/java/org/monogram/presentation/features/webview/InternalWebView.kt
@@ -37,7 +37,7 @@ import org.monogram.presentation.features.webview.components.OptionsSheet
 import org.monogram.presentation.features.webview.components.WebViewTopBar
 import java.io.ByteArrayInputStream
 
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 fun InternalWebView(
     url: String,