diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenCircularCountdownIndicator.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenCircularCountdownIndicator.kt
index fdd5b3947d..b52466e407 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenCircularCountdownIndicator.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenCircularCountdownIndicator.kt
@@ -35,6 +35,7 @@ fun BitwardenCircularCountdownIndicator(
             delayMillis = 0,
             easing = LinearOutSlowInEasing,
         ),
+        label = "CircularCountDownAnimation",
     )
 
     Box(
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenIconButtonWithResource.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenIconButtonWithResource.kt
index a65a5592c1..fec8eeeae8 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenIconButtonWithResource.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenIconButtonWithResource.kt
@@ -25,8 +25,8 @@ import com.x8bit.bitwarden.ui.platform.theme.BitwardenTheme
 fun BitwardenIconButtonWithResource(
     iconRes: IconResource,
     onClick: () -> Unit,
-    isEnabled: Boolean = true,
     modifier: Modifier = Modifier,
+    isEnabled: Boolean = true,
 ) {
     FilledIconButton(
         modifier = modifier.semantics(mergeDescendants = true) {},
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenMultiSelectButton.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenMultiSelectButton.kt
index 71f9a01e33..f7c4aa4ff4 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenMultiSelectButton.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenMultiSelectButton.kt
@@ -61,8 +61,8 @@ fun BitwardenMultiSelectButton(
     options: ImmutableList<String>,
     selectedOption: String?,
     onOptionSelected: (String) -> Unit,
-    isEnabled: Boolean = true,
     modifier: Modifier = Modifier,
+    isEnabled: Boolean = true,
     supportingText: String? = null,
     tooltip: TooltipData? = null,
 ) {
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenTextField.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenTextField.kt
index 1ea77bcdf2..a53e74c000 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenTextField.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenTextField.kt
@@ -8,7 +8,7 @@ import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
@@ -63,7 +63,7 @@ fun BitwardenTextField(
     isError: Boolean = false,
     visualTransformation: VisualTransformation = VisualTransformation.None,
 ) {
-    var widthPx by remember { mutableStateOf(0) }
+    var widthPx by remember { mutableIntStateOf(0) }
 
     val currentTextStyle = textStyle ?: LocalTextStyle.current
     val formattedText = if (shouldAddCustomLineBreaks) {
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt
index 34e2f2bf1e..0f5cee2dbc 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorScreen.kt
@@ -27,6 +27,7 @@ import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -580,7 +581,7 @@ private fun PasswordLengthSliderItem(
     minValue: Int,
     maxValue: Int,
 ) {
-    var sliderValue by remember { mutableStateOf(length.coerceIn(minValue, maxValue)) }
+    var sliderValue by remember { mutableIntStateOf(length.coerceIn(minValue, maxValue)) }
     var labelTextWidth by remember { mutableStateOf(Dp.Unspecified) }
 
     val density = LocalDensity.current
@@ -1389,17 +1390,17 @@ private data class PassphraseHandlers(
 private data class UsernameTypeHandlers(
     val onUsernameTooltipClicked: () -> Unit,
 ) {
-   companion object {
-       fun create(viewModel: GeneratorViewModel): UsernameTypeHandlers {
-           return UsernameTypeHandlers(
-               onUsernameTooltipClicked = {
-                   viewModel.trySendAction(
-                       GeneratorAction.MainType.Username.UsernameType.TooltipClick,
-                   )
-               },
-           )
-       }
-   }
+    companion object {
+        fun create(viewModel: GeneratorViewModel): UsernameTypeHandlers {
+            return UsernameTypeHandlers(
+                onUsernameTooltipClicked = {
+                    viewModel.trySendAction(
+                        GeneratorAction.MainType.Username.UsernameType.TooltipClick,
+                    )
+                },
+            )
+        }
+    }
 }
 
 /**
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryListItem.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryListItem.kt
index c802a5128d..0792ea2ee8 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryListItem.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryListItem.kt
@@ -11,7 +11,7 @@ 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.mutableIntStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
@@ -51,7 +51,7 @@ fun PasswordHistoryListItem(
     ) {
 
         Column(modifier = Modifier.weight(1f)) {
-            var widthPx by remember(label) { mutableStateOf(0) }
+            var widthPx by remember(label) { mutableIntStateOf(0) }
             val textStyle = LocalNonMaterialTypography.current.sensitiveInfoMedium
             val formattedText = label.withLineBreaksAtWidth(
                 widthPx = widthPx.toFloat(),
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendCustomDateChooser.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendCustomDateChooser.kt
index f983cfdcda..bacbd2c513 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendCustomDateChooser.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendCustomDateChooser.kt
@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableLongStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -45,7 +46,7 @@ fun AddSendCustomDateChooser(
     // This tracks just the time component (hours and minutes) and ignores the higher level
     // components. 0 representing midnight and counting up from there.
     var timeMillis: Long by remember {
-        mutableStateOf(
+        mutableLongStateOf(
             currentZonedDateTime.orNow().let {
                 it.hour.hours.inWholeMilliseconds + it.minute.minutes.inWholeMilliseconds
             },