diff --git a/app/src/main/java/com/aurora/store/compose/composables/BlackListComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/BlackListComposable.kt
index 61e415452..27b5a86f7 100644
--- a/app/src/main/java/com/aurora/store/compose/composables/BlackListComposable.kt
+++ b/app/src/main/java/com/aurora/store/compose/composables/BlackListComposable.kt
@@ -58,7 +58,7 @@ fun BlackListComposable(
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .clickable(enabled = isEnabled) { onClick() }
+            .clickable(enabled = isEnabled, onClick = onClick)
             .padding(
                 horizontal = dimensionResource(R.dimen.padding_medium),
                 vertical = dimensionResource(R.dimen.padding_xsmall)
diff --git a/app/src/main/java/com/aurora/store/compose/composables/CategoryComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/CategoryComposable.kt
index 2484a46f1..fd5680999 100644
--- a/app/src/main/java/com/aurora/store/compose/composables/CategoryComposable.kt
+++ b/app/src/main/java/com/aurora/store/compose/composables/CategoryComposable.kt
@@ -37,7 +37,7 @@ fun CategoryComposable(category: Category, onClick: () -> Unit = {}) {
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .clickable { onClick() }
+            .clickable(onClick = onClick)
             .padding(dimensionResource(R.dimen.padding_small)),
         horizontalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium))
     ) {
diff --git a/app/src/main/java/com/aurora/store/compose/composables/DeviceComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/DeviceComposable.kt
index 953158b04..c19abefba 100644
--- a/app/src/main/java/com/aurora/store/compose/composables/DeviceComposable.kt
+++ b/app/src/main/java/com/aurora/store/compose/composables/DeviceComposable.kt
@@ -44,7 +44,7 @@ fun DeviceComposable(
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .clickable { onClick() }
+            .clickable(onClick = onClick)
             .padding(dimensionResource(R.dimen.padding_small)),
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.SpaceBetween
diff --git a/app/src/main/java/com/aurora/store/compose/composables/DispenserComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/DispenserComposable.kt
index e6ec43419..8705c0447 100644
--- a/app/src/main/java/com/aurora/store/compose/composables/DispenserComposable.kt
+++ b/app/src/main/java/com/aurora/store/compose/composables/DispenserComposable.kt
@@ -35,7 +35,7 @@ fun DispenserComposable(url: String, onClick: () -> Unit = {}, onClear: () -> Un
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .clickable { onClick() }
+            .clickable(onClick = onClick)
             .padding(dimensionResource(R.dimen.padding_small)),
         horizontalArrangement = Arrangement.SpaceBetween,
         verticalAlignment = Alignment.CenterVertically
diff --git a/app/src/main/java/com/aurora/store/compose/composables/FavouriteComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/FavouriteComposable.kt
index 4ae0bf272..298e11037 100644
--- a/app/src/main/java/com/aurora/store/compose/composables/FavouriteComposable.kt
+++ b/app/src/main/java/com/aurora/store/compose/composables/FavouriteComposable.kt
@@ -53,7 +53,7 @@ fun FavouriteComposable(
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .clickable { onClick() }
+            .clickable(onClick = onClick)
             .padding(
                 horizontal = dimensionResource(R.dimen.padding_medium),
                 vertical = dimensionResource(R.dimen.padding_xsmall)
diff --git a/app/src/main/java/com/aurora/store/compose/composables/HeaderComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/HeaderComposable.kt
index 191f0900d..049be8247 100644
--- a/app/src/main/java/com/aurora/store/compose/composables/HeaderComposable.kt
+++ b/app/src/main/java/com/aurora/store/compose/composables/HeaderComposable.kt
@@ -36,7 +36,7 @@ fun HeaderComposable(@StringRes title: Int, onClick: () -> Unit = {}) {
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .clickable { onClick() }
+            .clickable(onClick = onClick)
             .padding(
                 horizontal = dimensionResource(R.dimen.padding_small),
                 vertical = dimensionResource(R.dimen.padding_xxsmall)
diff --git a/app/src/main/java/com/aurora/store/compose/composables/InstallerComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/InstallerComposable.kt
index 68bc1b838..7d26d52f2 100644
--- a/app/src/main/java/com/aurora/store/compose/composables/InstallerComposable.kt
+++ b/app/src/main/java/com/aurora/store/compose/composables/InstallerComposable.kt
@@ -40,7 +40,7 @@ fun InstallerComposable(
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .clickable { onClick() }
+            .clickable(onClick = onClick)
             .padding(dimensionResource(R.dimen.padding_small)),
         horizontalArrangement = Arrangement.SpaceBetween,
         verticalAlignment = Alignment.CenterVertically
diff --git a/app/src/main/java/com/aurora/store/compose/composables/LinkComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/LinkComposable.kt
index d533bd769..f1dad80e4 100644
--- a/app/src/main/java/com/aurora/store/compose/composables/LinkComposable.kt
+++ b/app/src/main/java/com/aurora/store/compose/composables/LinkComposable.kt
@@ -38,7 +38,7 @@ fun LinkComposable(link: Link, onClick: () -> Unit = {}) {
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .clickable { onClick() }
+            .clickable(onClick = onClick)
             .padding(dimensionResource(R.dimen.padding_small)),
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium))
diff --git a/app/src/main/java/com/aurora/store/compose/composables/LocaleComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/LocaleComposable.kt
index b4a9e7d9a..960cfca90 100644
--- a/app/src/main/java/com/aurora/store/compose/composables/LocaleComposable.kt
+++ b/app/src/main/java/com/aurora/store/compose/composables/LocaleComposable.kt
@@ -40,7 +40,7 @@ fun LocaleComposable(
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .clickable { onClick() }
+            .clickable(onClick = onClick)
             .padding(dimensionResource(R.dimen.padding_small)),
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.SpaceBetween
diff --git a/app/src/main/java/com/aurora/store/compose/composables/SearchSuggestionComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/SearchSuggestionComposable.kt
index f5af98822..ebe00c3ba 100644
--- a/app/src/main/java/com/aurora/store/compose/composables/SearchSuggestionComposable.kt
+++ b/app/src/main/java/com/aurora/store/compose/composables/SearchSuggestionComposable.kt
@@ -45,7 +45,7 @@ fun SearchSuggestionComposable(
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .clickable { onClick() }
+            .clickable(onClick = onClick)
             .padding(dimensionResource(R.dimen.padding_medium)),
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.SpaceBetween
@@ -53,7 +53,7 @@ fun SearchSuggestionComposable(
         Row(
             modifier = Modifier
                 .weight(1F)
-                .clickable { onClick() },
+                .clickable(onClick = onClick),
             horizontalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium))
         ) {
             AsyncImage(
diff --git a/app/src/main/java/com/aurora/store/compose/composables/app/AppComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/app/AppComposable.kt
index 40d0f6b1a..80604776c 100644
--- a/app/src/main/java/com/aurora/store/compose/composables/app/AppComposable.kt
+++ b/app/src/main/java/com/aurora/store/compose/composables/app/AppComposable.kt
@@ -42,7 +42,7 @@ fun AppComposable(app: App, onClick: () -> Unit = {}) {
     Column(
         modifier = Modifier
             .width(dimensionResource(R.dimen.icon_size_cluster))
-            .clickable { onClick() }
+            .clickable(onClick = onClick)
             .padding(dimensionResource(R.dimen.padding_xsmall))
     ) {
         AsyncImage(
diff --git a/app/src/main/java/com/aurora/store/compose/composables/app/AppListComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/app/AppListComposable.kt
index 86738d3f9..76fdff935 100644
--- a/app/src/main/java/com/aurora/store/compose/composables/app/AppListComposable.kt
+++ b/app/src/main/java/com/aurora/store/compose/composables/app/AppListComposable.kt
@@ -45,7 +45,7 @@ fun AppListComposable(app: App, onClick: () -> Unit = {}) {
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .clickable { onClick() }
+            .clickable(onClick = onClick)
             .padding(
                 horizontal = dimensionResource(R.dimen.padding_medium),
                 vertical = dimensionResource(R.dimen.padding_small)
diff --git a/app/src/main/java/com/aurora/store/compose/composables/app/AppProgressComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/app/AppProgressComposable.kt
index f162c7064..d1d9151b4 100644
--- a/app/src/main/java/com/aurora/store/compose/composables/app/AppProgressComposable.kt
+++ b/app/src/main/java/com/aurora/store/compose/composables/app/AppProgressComposable.kt
@@ -6,7 +6,7 @@
 package com.aurora.store.compose.composables.app
 
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.requiredSize
 import androidx.compose.material3.CircularProgressIndicator
@@ -24,7 +24,7 @@ import com.aurora.store.R
 fun AppProgressComposable() {
     Box(
         modifier = Modifier
-            .fillMaxWidth()
+            .fillMaxSize()
             .padding(dimensionResource(R.dimen.padding_small)),
         contentAlignment = Alignment.Center
     ) {