diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/dashboard/ui/ScannerDashboardScreen.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/dashboard/ui/ScannerDashboardScreen.kt
index f925712b..970e908a 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/dashboard/ui/ScannerDashboardScreen.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/dashboard/ui/ScannerDashboardScreen.kt
@@ -7,15 +7,16 @@ import android.util.Log
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.ui.Alignment
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
@@ -384,7 +385,7 @@ fun ScannerDashboardScreen(
                 }
                 is HomeItem.Ad -> {
                     val config = chooseAdsConfigFor(item.slot, visibleCount, promotedApp != null)
-                    AdBanner(adsConfig = config)
+                    AdBanner(modifier = Modifier.fillMaxWidth(), adsConfig = config)
                 }
             }
         }
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/dashboard/ui/components/DashboardActionCard.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/dashboard/ui/components/DashboardActionCard.kt
index fbe63da2..0493417c 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/dashboard/ui/components/DashboardActionCard.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/dashboard/ui/components/DashboardActionCard.kt
@@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedCard
@@ -25,6 +24,8 @@ import androidx.constraintlayout.compose.ConstraintLayout
 import com.d4rk.android.libs.apptoolkit.core.ui.components.buttons.TonalIconButtonWithText
 import com.d4rk.android.libs.apptoolkit.core.ui.components.modifiers.bounceClick
 import com.d4rk.android.libs.apptoolkit.core.utils.constants.ui.SizeConstants
+import com.d4rk.cleaner.app.core.ui.theme.GroupedGridStyle
+import androidx.compose.foundation.shape.RoundedCornerShape
 
 @Composable
 fun DashboardActionCard(
@@ -44,7 +45,7 @@ fun DashboardActionCard(
 ) {
     OutlinedCard(
         modifier = modifier.fillMaxWidth(),
-        shape = RoundedCornerShape(SizeConstants.ExtraLargeSize),
+        shape = GroupedGridStyle.cardShape,
     ) {
         Column {
             Column(
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/ui/components/PromotedAppCard.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/ui/components/PromotedAppCard.kt
index fbabafc5..4062995f 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/ui/components/PromotedAppCard.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/ui/components/PromotedAppCard.kt
@@ -7,7 +7,6 @@ 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.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Recommend
 import androidx.compose.material.icons.outlined.Shop
@@ -29,13 +28,14 @@ import com.d4rk.android.libs.apptoolkit.core.utils.constants.ui.SizeConstants
 import com.d4rk.android.libs.apptoolkit.core.utils.helpers.IntentsHelper
 import com.d4rk.cleaner.R
 import com.d4rk.cleaner.app.clean.scanner.domain.data.model.ui.PromotedApp
+import com.d4rk.cleaner.app.core.ui.theme.GroupedGridStyle
 
 @Composable
 fun PromotedAppCard(app: PromotedApp, modifier: Modifier = Modifier) {
     val context = LocalContext.current
     OutlinedCard(
         modifier = modifier.fillMaxWidth(),
-        shape = RoundedCornerShape(SizeConstants.ExtraLargeSize)
+        shape = GroupedGridStyle.cardShape
     ) {
         Column(
             modifier = Modifier
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/ui/components/QuickScanSummaryCard.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/ui/components/QuickScanSummaryCard.kt
index d5302781..cb6bc62f 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/ui/components/QuickScanSummaryCard.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/ui/components/QuickScanSummaryCard.kt
@@ -9,7 +9,6 @@ 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.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.CleaningServices
 import androidx.compose.material.icons.outlined.DiscFull
@@ -39,6 +38,7 @@ import com.d4rk.android.libs.apptoolkit.core.ui.components.spacers.SmallVertical
 import com.d4rk.android.libs.apptoolkit.core.utils.constants.ui.SizeConstants
 import com.d4rk.cleaner.R
 import com.d4rk.cleaner.app.notifications.notifications.CleanerMessageProvider
+import com.d4rk.cleaner.app.core.ui.theme.GroupedGridStyle
 
 @Composable
 fun QuickScanSummaryCard(
@@ -70,7 +70,7 @@ fun QuickScanSummaryCard(
 
     OutlinedCard(
         modifier = modifier.fillMaxWidth(),
-        shape = RoundedCornerShape(size = SizeConstants.ExtraLargeSize),
+        shape = GroupedGridStyle.cardShape,
     ) {
         Row(
             modifier = Modifier
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/ui/components/WeeklyCleanStreakCard.kt b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/ui/components/WeeklyCleanStreakCard.kt
index 58ac1218..d8895ce3 100644
--- a/app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/ui/components/WeeklyCleanStreakCard.kt
+++ b/app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/ui/components/WeeklyCleanStreakCard.kt
@@ -32,6 +32,7 @@ import com.d4rk.android.libs.apptoolkit.core.ui.components.buttons.IconButton
 import com.d4rk.android.libs.apptoolkit.core.ui.components.spacers.MediumVerticalSpacer
 import com.d4rk.android.libs.apptoolkit.core.utils.constants.ui.SizeConstants
 import com.d4rk.cleaner.R
+import com.d4rk.cleaner.app.core.ui.theme.GroupedGridStyle
 
 @Composable
 fun WeeklyCleanStreakCard(
@@ -53,7 +54,7 @@ fun WeeklyCleanStreakCard(
 
     OutlinedCard(
         modifier = modifier.fillMaxWidth(),
-        shape = RoundedCornerShape(SizeConstants.ExtraLargeSize),
+        shape = GroupedGridStyle.cardShape,
     ) {
         Column(
             modifier = Modifier