diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosButtons.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosButtons.kt
index a251e6cae8e3..9e593fa664b8 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosButtons.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosButtons.kt
@@ -277,7 +277,7 @@ fun WooPosButtonsPreview() {
                 .padding(WooPosSpacing.Medium.value)
                 .width(600.dp)
                 .verticalScroll(rememberScrollState()),
-            verticalArrangement = Arrangement.spacedBy(8.dp),
+            verticalArrangement = Arrangement.spacedBy(WooPosSpacing.Small.value),
         ) {
             WooPosButton(
                 text = "Button",
@@ -333,7 +333,7 @@ fun WooPosSmallButtonsPreview() {
                 .padding(WooPosSpacing.Medium.value)
                 .width(600.dp)
                 .verticalScroll(rememberScrollState()),
-            verticalArrangement = Arrangement.spacedBy(8.dp),
+            verticalArrangement = Arrangement.spacedBy(WooPosSpacing.Small.value),
         ) {
             WooPosButtonSmall(
                 text = "Button Small",
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosChip.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosChip.kt
index ae6309153474..330399bb26b3 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosChip.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosChip.kt
@@ -87,7 +87,7 @@ fun WooPosChipPreview() {
                 modifier = Modifier
             ) {
                 Row(
-                    horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.Start),
+                    horizontalArrangement = Arrangement.spacedBy(WooPosSpacing.Small.value, Alignment.Start),
                     verticalAlignment = Alignment.CenterVertically,
                 ) {
                     WooPosChip(
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosEmptyScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosEmptyScreen.kt
index aebf63decaa5..e44b9b4250e2 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosEmptyScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosEmptyScreen.kt
@@ -22,7 +22,6 @@ import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosIco
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTypography
-import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
 
 @Composable
 fun WooPosEmptyScreen(
@@ -88,7 +87,7 @@ private fun WooPosItemsEmptyListInternal(
                 contentDescription = contentDescription,
             )
 
-            Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value))
 
             WooPosText(
                 text = title,
@@ -96,7 +95,7 @@ private fun WooPosItemsEmptyListInternal(
                 fontWeight = FontWeight.Bold,
             )
 
-            Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value))
 
             WooPosText(
                 text = message,
@@ -105,7 +104,7 @@ private fun WooPosItemsEmptyListInternal(
                 textAlign = TextAlign.Center
             )
 
-            Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value))
 
             if (onActionClicked != null && actionLabel != null) {
                 WooPosButton(
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosErrorScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosErrorScreen.kt
index 3f51238c1c0b..68e9382ff9a2 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosErrorScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosErrorScreen.kt
@@ -25,7 +25,6 @@ import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosIco
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTypography
-import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
 
 @Composable
 fun WooPosErrorScreen(
@@ -40,7 +39,7 @@ fun WooPosErrorScreen(
         modifier = modifier
             .fillMaxSize()
             .clip(RoundedCornerShape(WooPosCornerRadius.Medium.value))
-            .padding(WooPosSpacing.XLarge.value.toAdaptivePadding()),
+            .padding(WooPosSpacing.XLarge.value),
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.Center,
     ) {
@@ -55,7 +54,7 @@ fun WooPosErrorScreen(
                 tint = WooPosTheme.colors.unspecified,
             )
 
-            Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value))
 
             WooPosText(
                 text = message,
@@ -64,15 +63,14 @@ fun WooPosErrorScreen(
                 textAlign = TextAlign.Center,
             )
 
-            Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value))
 
             WooPosText(
                 text = reason,
                 style = WooPosTypography.BodyLarge,
                 textAlign = TextAlign.Center,
             )
-            @Suppress("WooPosDesignSystemSpacingUsageRule")
-            Spacer(modifier = Modifier.height(40.dp.toAdaptivePadding()))
+            Spacer(modifier = Modifier.height(WooPosSpacing.XXLarge.value))
             primaryButton?.let {
                 WooPosButton(
                     text = it.text,
@@ -81,14 +79,14 @@ fun WooPosErrorScreen(
                 )
             }
             secondaryButton?.let {
-                Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value.toAdaptivePadding()))
+                Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value))
                 WooPosOutlinedButton(
                     text = it.text,
                     onClick = it.click,
                     modifier = WooPosErrorAndEmptyStateButtonModifier
                 )
             }
-            Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value))
         }
     }
 }
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosExitConfirmationDialog.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosExitConfirmationDialog.kt
index bf31b165f7f2..dd4293d1a141 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosExitConfirmationDialog.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosExitConfirmationDialog.kt
@@ -24,7 +24,6 @@ import com.woocommerce.android.ui.woopos.common.composeui.WooPosPreview
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTypography
-import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
@@ -48,25 +47,23 @@ fun WooPosExitConfirmationDialog(
         onDismissRequest = onDismissRequest,
     ) {
         Box(
-            modifier = modifier.padding(WooPosSpacing.XLarge.value.toAdaptivePadding())
+            modifier = modifier.padding(WooPosSpacing.XLarge.value)
         ) {
             Column(horizontalAlignment = Alignment.CenterHorizontally) {
-                @Suppress("WooPosDesignSystemSpacingUsageRule")
-                Spacer(modifier = modifier.height(48.dp.toAdaptivePadding()))
+                Spacer(modifier = modifier.height(WooPosSpacing.XXXLarge.value))
                 WooPosText(
                     text = title,
                     style = WooPosTypography.Heading,
                     fontWeight = FontWeight.Bold,
                     color = MaterialTheme.colorScheme.onSurface,
                 )
-                Spacer(modifier = modifier.height(WooPosSpacing.Medium.value.toAdaptivePadding()))
+                Spacer(modifier = modifier.height(WooPosSpacing.Medium.value))
                 WooPosText(
                     text = message,
                     style = WooPosTypography.BodyLarge,
                     color = MaterialTheme.colorScheme.onSurface,
                 )
-                @Suppress("WooPosDesignSystemSpacingUsageRule")
-                Spacer(modifier = modifier.height(56.dp.toAdaptivePadding()))
+                Spacer(modifier = modifier.height(WooPosSpacing.XXXLarge.value))
                 WooPosButton(
                     modifier = modifier
                         .fillMaxWidth(),
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosPaginationErrorIndicator.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosPaginationErrorIndicator.kt
index 0dbfc50a046b..d28f9ea7749f 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosPaginationErrorIndicator.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosPaginationErrorIndicator.kt
@@ -28,7 +28,6 @@ import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosIco
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTypography
-import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
 import com.woocommerce.android.ui.woopos.home.items.WooPosItemList
 import com.woocommerce.android.ui.woopos.home.items.WooPosItemSelectionViewState.Product
 import com.woocommerce.android.ui.woopos.home.items.WooPosPaginationState
@@ -98,7 +97,7 @@ private fun WooPosPaginationErrorIndicatorContent(
 
                 Column(
                     modifier = if (icon == null) {
-                        Modifier.padding(start = WooPosSpacing.Medium.value.toAdaptivePadding())
+                        Modifier.padding(start = WooPosSpacing.Medium.value)
                     } else {
                         Modifier
                     }
@@ -111,7 +110,7 @@ private fun WooPosPaginationErrorIndicatorContent(
                     WooPosText(
                         text = description,
                         style = WooPosTypography.BodyMedium,
-                        modifier = Modifier.padding(top = WooPosSpacing.Small.value.toAdaptivePadding())
+                        modifier = Modifier.padding(top = WooPosSpacing.Small.value)
                     )
                 }
             }
@@ -120,7 +119,7 @@ private fun WooPosPaginationErrorIndicatorContent(
                 text = primaryButton.text,
                 onClick = primaryButton.click,
                 modifier = Modifier
-                    .padding(end = WooPosSpacing.Medium.value.toAdaptivePadding())
+                    .padding(end = WooPosSpacing.Medium.value)
             )
         }
     }
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosRecentSearchesChips.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosRecentSearchesChips.kt
index 8044209f3f17..c97272848246 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosRecentSearchesChips.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosRecentSearchesChips.kt
@@ -20,7 +20,6 @@ import androidx.compose.ui.text.font.FontWeight
 import com.woocommerce.android.R
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTypography
-import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
 
 @Composable
 fun WooPosRecentSearchesChips(
@@ -29,7 +28,7 @@ fun WooPosRecentSearchesChips(
 ) {
     Column {
         SectionHeader(
-            modifier = Modifier.padding(horizontal = WooPosSpacing.Medium.value.toAdaptivePadding()),
+            modifier = Modifier.padding(horizontal = WooPosSpacing.Medium.value),
             title = stringResource(R.string.woopos_search_recent_searches_title)
         )
 
@@ -42,7 +41,7 @@ fun WooPosRecentSearchesChips(
             horizontalArrangement = Arrangement.spacedBy(WooPosSpacing.Small.value, Alignment.Start),
             verticalAlignment = Alignment.CenterVertically
         ) {
-            Spacer(modifier = Modifier.width(WooPosSpacing.Small.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.width(WooPosSpacing.Small.value))
 
             recentSearches.forEach { recentSearch ->
                 WooPosChip(
@@ -52,7 +51,7 @@ fun WooPosRecentSearchesChips(
                 )
             }
 
-            Spacer(modifier = Modifier.width(WooPosSpacing.Small.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.width(WooPosSpacing.Small.value))
         }
     }
 }
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosSearchInput.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosSearchInput.kt
index 49b12cd11fe1..869e7c0709f2 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosSearchInput.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosSearchInput.kt
@@ -53,7 +53,6 @@ import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosCor
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTypography
-import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
 import com.woocommerce.android.ui.woopos.home.items.WOO_POS_ITEMS_TOOLBAR_HEIGHT
 import kotlinx.coroutines.delay
 import kotlinx.parcelize.Parcelize
@@ -126,7 +125,7 @@ private fun SearchInput(
         modifier = Modifier.fillMaxWidth()
     ) {
         WooPosBackButton(
-            modifier = Modifier.padding(start = WooPosSpacing.Small.value.toAdaptivePadding()),
+            modifier = Modifier.padding(start = WooPosSpacing.Small.value),
             contentDescription = stringResource(R.string.woopos_search_back_content_description)
         ) { onEvent(WooPosSearchUIEvent.Close) }
 
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosToolbar.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosToolbar.kt
index b0214af02413..e12f51e6c8e0 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosToolbar.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosToolbar.kt
@@ -21,7 +21,6 @@ import com.woocommerce.android.ui.woopos.common.composeui.WooPosPreview
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTypography
-import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
 
 @Composable
 fun WooPosToolbar(
@@ -50,11 +49,11 @@ fun WooPosToolbar(
             }
         ) {
             WooPosBackButton(
-                modifier = Modifier.padding(start = WooPosSpacing.Small.value.toAdaptivePadding())
+                modifier = Modifier.padding(start = WooPosSpacing.Small.value)
             ) { onBackClicked?.invoke() }
         }
 
-        val startPadding = WooPosSpacing.Small.value.toAdaptivePadding()
+        val startPadding = WooPosSpacing.Small.value
         WooPosText(
             text = titleText,
             style = titleStyle,
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/designsystem/WooPosIcons.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/designsystem/WooPosIcons.kt
index a13054fa5904..d602d607dd62 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/designsystem/WooPosIcons.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/designsystem/WooPosIcons.kt
@@ -637,8 +637,8 @@ private fun WooPosIconsPreview() {
         ) {
             FlowRow(
                 modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.spacedBy(8.dp),
-                verticalArrangement = Arrangement.spacedBy(8.dp),
+                horizontalArrangement = Arrangement.spacedBy(WooPosSpacing.Small.value),
+                verticalArrangement = Arrangement.spacedBy(WooPosSpacing.Small.value),
                 maxItemsInEachRow = 4
             ) {
                 Box(
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/designsystem/WooPosSizes.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/designsystem/WooPosSizes.kt
index 03dd1c06a3e0..5f28a542c344 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/designsystem/WooPosSizes.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/designsystem/WooPosSizes.kt
@@ -15,13 +15,21 @@ enum class WooPosCornerRadius(val value: Dp) {
     XLarge(24.dp)
 }
 
-enum class WooPosSpacing(val value: Dp) {
+enum class WooPosSpacing(private val baseValue: Dp) {
     None(0.dp),
+    XXSmall(2.dp),
     XSmall(4.dp),
     Small(8.dp),
     Medium(16.dp),
     Large(24.dp),
-    XLarge(32.dp)
+    XLarge(32.dp),
+    XXLarge(40.dp),
+    XXXLarge(48.dp),
+    Huge(80.dp),
+    Gigantic(104.dp);
+
+    val value: Dp
+        @Composable get() = baseValue.toAdaptivePadding()
 }
 
 enum class WooPosElevation(val value: Dp) {
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/eligibility/WooPosEligibilityScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/eligibility/WooPosEligibilityScreen.kt
index 5120e33cab57..2d8f9929402a 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/eligibility/WooPosEligibilityScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/eligibility/WooPosEligibilityScreen.kt
@@ -29,7 +29,6 @@ import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosIco
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTypography
-import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
 import com.woocommerce.android.ui.woopos.root.navigation.WooPosNavigationEvent
 import com.woocommerce.android.ui.woopos.tab.WooPosLaunchability
 
@@ -71,7 +70,7 @@ fun WooPosEligibilityScreen(
     Column(
         modifier = Modifier
             .fillMaxSize()
-            .padding(WooPosSpacing.Large.value.toAdaptivePadding()),
+            .padding(WooPosSpacing.Large.value),
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.Center
     ) {
@@ -80,7 +79,7 @@ fun WooPosEligibilityScreen(
             contentDescription = null
         )
 
-        Spacer(modifier = Modifier.height(WooPosSpacing.Large.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.Large.value))
 
         WooPosText(
             text = stringResource(R.string.woopos_eligibility_screen_unable_to_load),
@@ -88,7 +87,7 @@ fun WooPosEligibilityScreen(
             textAlign = TextAlign.Center
         )
 
-        Spacer(modifier = Modifier.height(WooPosSpacing.Large.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.Large.value))
 
         val suggestionText = when (retryState) {
             is WooPosEligibilityRetryState.Ineligible -> retryState.suggestionText
@@ -104,7 +103,7 @@ fun WooPosEligibilityScreen(
                 modifier = Modifier.width(547.dp)
             )
 
-            Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value))
         }
 
         WooPosButton(
@@ -118,7 +117,7 @@ fun WooPosEligibilityScreen(
             modifier = Modifier.size(width = 366.dp, height = 80.dp)
         )
 
-        Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value))
 
         WooPosOutlinedButton(
             text = stringResource(id = R.string.woopos_eligibility_exit_pos_label),
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/WooPosHomeScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/WooPosHomeScreen.kt
index 0a4c631cf69e..0aff4654b283 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/WooPosHomeScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/WooPosHomeScreen.kt
@@ -30,7 +30,6 @@ import com.woocommerce.android.ui.woopos.common.composeui.WooPosPreview
 import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosExitConfirmationDialog
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
-import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
 import com.woocommerce.android.ui.woopos.common.composeui.isPreviewMode
 import com.woocommerce.android.ui.woopos.common.composeui.modifier.listenForBarcodes
 import com.woocommerce.android.ui.woopos.home.cart.WooPosCartScreen
@@ -164,7 +163,7 @@ private fun WooPosHomeScreen(
 
         WooPosHomeScreenToolbar(
             modifier = Modifier
-                .padding(WooPosSpacing.Large.value.toAdaptivePadding())
+                .padding(WooPosSpacing.Large.value)
                 .align(Alignment.BottomStart),
         )
 
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt
index a567ae77786b..a37b3c25cf00 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartScreen.kt
@@ -91,7 +91,6 @@ import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosEle
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTypography
-import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
 import com.woocommerce.android.ui.woopos.home.cart.WooPosCartItemViewState.Coupon.CouponValidationState
 import com.woocommerce.android.ui.woopos.home.cart.WooPosCartUIEvent.ItemRemovedFromCart
 import com.woocommerce.android.ui.woopos.util.WooPosTestTags
@@ -145,7 +144,7 @@ private fun WooPosCartScreen(
             }
 
             is WooPosCartState.Body.WithItems -> {
-                val productsTopMargin = WooPosSpacing.Large.value.toAdaptivePadding()
+                val productsTopMargin = WooPosSpacing.Large.value
                 CartBodyWithItems(
                     modifier = Modifier.constrainAs(body) {
                         top.linkTo(toolbar.bottom, margin = productsTopMargin)
@@ -168,8 +167,8 @@ private fun WooPosCartScreen(
             exit = fadeOut(animationSpec = tween(300)),
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(WooPosSpacing.Medium.value.toAdaptivePadding())
-                .padding(bottom = WooPosSpacing.Small.value.toAdaptivePadding())
+                .padding(WooPosSpacing.Medium.value)
+                .padding(bottom = WooPosSpacing.Small.value)
                 .constrainAs(checkoutButton) {
                     bottom.linkTo(parent.bottom)
                     start.linkTo(parent.start)
@@ -199,7 +198,7 @@ fun CartBodyEmpty(
 ) {
     Column(
         modifier = modifier
-            .padding(WooPosSpacing.XLarge.value.toAdaptivePadding()),
+            .padding(WooPosSpacing.XLarge.value),
         verticalArrangement = Arrangement.Center,
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
@@ -210,7 +209,7 @@ fun CartBodyEmpty(
             tint = WooPosTheme.colors.onSurfaceVariantLowest.copy(alpha = 0.5F)
         )
 
-        Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value))
 
         val annotatedText = buildAnnotatedString {
             append(stringResource(R.string.woopos_cart_empty_subtitle_with_scanner))
@@ -241,8 +240,8 @@ fun CartBodyEmpty(
             modifier = Modifier
                 .clickable { onBarcodeSetupClicked() }
                 .padding(
-                    horizontal = WooPosSpacing.XLarge.value.toAdaptivePadding(),
-                    vertical = WooPosSpacing.Medium.value.toAdaptivePadding(),
+                    horizontal = WooPosSpacing.XLarge.value,
+                    vertical = WooPosSpacing.Medium.value,
                 )
         )
     }
@@ -266,14 +265,14 @@ private fun CartBodyWithItems(
 
     WooPosLazyColumn(
         modifier = modifier
-            .padding(horizontal = WooPosSpacing.Medium.value.toAdaptivePadding())
+            .padding(horizontal = WooPosSpacing.Medium.value)
             .fillMaxSize(),
         state = listState,
-        verticalArrangement = Arrangement.spacedBy(WooPosSpacing.Small.value.toAdaptivePadding()),
+        verticalArrangement = Arrangement.spacedBy(WooPosSpacing.Small.value),
         horizontalAlignment = Alignment.CenterHorizontally,
         contentPadding = PaddingValues(
-            top = WooPosSpacing.XSmall.value.toAdaptivePadding(),
-            bottom = WooPosSpacing.Small.value.toAdaptivePadding()
+            top = WooPosSpacing.XSmall.value,
+            bottom = WooPosSpacing.Small.value
         ),
         withBottomShadow = true,
     ) {
@@ -341,7 +340,7 @@ private fun CartToolbar(
     onBackClicked: () -> Unit
 ) {
     val iconSize = 28.dp
-    val iconTitlePadding = WooPosSpacing.Medium.value.toAdaptivePadding()
+    val iconTitlePadding = WooPosSpacing.Medium.value
     val titleOffset by animateDpAsState(
         targetValue = if (toolbar.backIconVisible) iconSize + iconTitlePadding else 0.dp,
         animationSpec = tween(durationMillis = 300),
@@ -367,7 +366,7 @@ private fun CartToolbar(
                         start.linkTo(parent.start)
                         centerVerticallyTo(parent)
                     }
-                    .padding(start = WooPosSpacing.Small.value.toAdaptivePadding()),
+                    .padding(start = WooPosSpacing.Small.value),
                 contentDescription = stringResource(R.string.woopos_cart_back_content_description),
                 iconModifier = Modifier
                     .size(iconSize)
@@ -386,7 +385,7 @@ private fun CartToolbar(
                     centerVerticallyTo(parent)
                 }
                 .padding(
-                    start = WooPosSpacing.Medium.value.toAdaptivePadding(),
+                    start = WooPosSpacing.Medium.value,
                     end = WooPosSpacing.XSmall.value,
                 )
         )
@@ -401,7 +400,7 @@ private fun CartToolbar(
         )
 
         toolbar.itemsCount?.let {
-            val itemsEndMargin = WooPosSpacing.Medium.value.toAdaptivePadding()
+            val itemsEndMargin = WooPosSpacing.Medium.value
             WooPosText(
                 text = it,
                 style = WooPosTypography.BodySmall,
@@ -430,7 +429,7 @@ private fun CartToolbar(
                         end.linkTo(parent.end)
                         centerVerticallyTo(parent)
                     }
-                    .padding(end = WooPosSpacing.Medium.value.toAdaptivePadding()),
+                    .padding(end = WooPosSpacing.Medium.value),
                 onClearCartClicked = onClearAllClicked
             )
         }
@@ -525,13 +524,13 @@ private fun ProductItem(
                 placeholderIconSize = 36.dp
             )
 
-            Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value))
 
             Column(
                 modifier = Modifier
                     .weight(1f)
-                    .padding(end = WooPosSpacing.Medium.value.toAdaptivePadding())
-                    .padding(vertical = WooPosSpacing.Medium.value.toAdaptivePadding())
+                    .padding(end = WooPosSpacing.Medium.value)
+                    .padding(vertical = WooPosSpacing.Medium.value)
             ) {
                 WooPosText(
                     text = item.name,
@@ -543,7 +542,7 @@ private fun ProductItem(
                     modifier = Modifier
                         .clearAndSetSemantics { }
                 )
-                Spacer(modifier = Modifier.height(WooPosSpacing.XSmall.value.toAdaptivePadding()))
+                Spacer(modifier = Modifier.height(WooPosSpacing.XSmall.value))
                 if (item.description.isNotNullOrEmpty()) {
                     WooPosText(
                         text = item.description ?: "",
@@ -554,7 +553,7 @@ private fun ProductItem(
                         modifier = Modifier
                             .clearAndSetSemantics { }
                     )
-                    Spacer(modifier = Modifier.height(WooPosSpacing.XSmall.value.toAdaptivePadding()))
+                    Spacer(modifier = Modifier.height(WooPosSpacing.XSmall.value))
                 }
                 WooPosText(
                     text = item.price,
@@ -565,7 +564,7 @@ private fun ProductItem(
                 )
 
                 if (item.productDoesNotExist) {
-                    Spacer(modifier = Modifier.height(WooPosSpacing.XSmall.value.toAdaptivePadding()))
+                    Spacer(modifier = Modifier.height(WooPosSpacing.XSmall.value))
                     WooPosText(
                         text = stringResource(R.string.woopos_cart_product_unknown_item),
                         style = WooPosTypography.BodySmall,
@@ -580,7 +579,7 @@ private fun ProductItem(
             if (canRemoveItems) {
                 RemoveItemFromCartButton(item, onUIEvent)
             }
-            Spacer(modifier = Modifier.width(WooPosSpacing.Small.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.width(WooPosSpacing.Small.value))
         }
     }
 }
@@ -639,13 +638,13 @@ private fun CouponItem(
                 )
             }
 
-            Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value))
 
             Column(
                 modifier = Modifier
                     .weight(1f)
-                    .padding(end = WooPosSpacing.Medium.value.toAdaptivePadding())
-                    .padding(vertical = WooPosSpacing.Medium.value.toAdaptivePadding())
+                    .padding(end = WooPosSpacing.Medium.value)
+                    .padding(vertical = WooPosSpacing.Medium.value)
             ) {
                 WooPosText(
                     text = item.name,
@@ -656,7 +655,7 @@ private fun CouponItem(
                     color = MaterialTheme.colorScheme.onSurface,
                     modifier = Modifier.clearAndSetSemantics { }
                 )
-                Spacer(modifier = Modifier.height(WooPosSpacing.XSmall.value.toAdaptivePadding()))
+                Spacer(modifier = Modifier.height(WooPosSpacing.XSmall.value))
                 WooPosText(
                     text = item.summary,
                     style = WooPosTypography.BodySmall,
@@ -668,7 +667,7 @@ private fun CouponItem(
                 when (item.validationState) {
                     CouponValidationState.Unknown -> Unit
                     CouponValidationState.Invalid -> {
-                        Spacer(modifier = Modifier.height(WooPosSpacing.XSmall.value.toAdaptivePadding()))
+                        Spacer(modifier = Modifier.height(WooPosSpacing.XSmall.value))
                         WooPosText(
                             text = stringResource(R.string.woopos_cart_coupon_invalid_subtitle),
                             style = WooPosTypography.BodySmall,
@@ -680,7 +679,7 @@ private fun CouponItem(
                     }
 
                     is CouponValidationState.Valid -> {
-                        Spacer(modifier = Modifier.height(WooPosSpacing.XSmall.value.toAdaptivePadding()))
+                        Spacer(modifier = Modifier.height(WooPosSpacing.XSmall.value))
                         WooPosText(
                             text = item.validationState.formattedDiscount,
                             style = WooPosTypography.BodySmall,
@@ -696,7 +695,7 @@ private fun CouponItem(
             if (canRemoveItems) {
                 RemoveItemFromCartButton(item, onUIEvent)
             }
-            Spacer(modifier = Modifier.width(WooPosSpacing.Small.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.width(WooPosSpacing.Small.value))
         }
     }
 }
@@ -734,12 +733,12 @@ private fun LoadingItem(
                 )
             }
 
-            Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value))
 
             Column(
                 modifier = Modifier
                     .weight(1f)
-                    .padding(end = WooPosSpacing.Medium.value.toAdaptivePadding())
+                    .padding(end = WooPosSpacing.Medium.value)
             ) {
                 WooPosShimmerText(
                     text = item.name,
@@ -747,7 +746,7 @@ private fun LoadingItem(
                     fontWeight = FontWeight.Bold
                 )
 
-                Spacer(modifier = Modifier.height(WooPosSpacing.XSmall.value.toAdaptivePadding()))
+                Spacer(modifier = Modifier.height(WooPosSpacing.XSmall.value))
 
                 WooPosShimmerText(
                     text = "$10.00",
@@ -758,7 +757,7 @@ private fun LoadingItem(
             if (canRemoveItems) {
                 RemoveItemFromCartButton(item, onUIEvent)
             }
-            Spacer(modifier = Modifier.width(WooPosSpacing.Small.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.width(WooPosSpacing.Small.value))
         }
     }
 }
@@ -805,13 +804,13 @@ private fun ErrorItem(
                 )
             }
 
-            Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value))
 
             Column(
                 modifier = Modifier
                     .weight(1f)
-                    .padding(end = WooPosSpacing.Medium.value.toAdaptivePadding())
-                    .padding(vertical = WooPosSpacing.Medium.value.toAdaptivePadding())
+                    .padding(end = WooPosSpacing.Medium.value)
+                    .padding(vertical = WooPosSpacing.Medium.value)
             ) {
                 WooPosText(
                     text = item.name,
@@ -823,7 +822,7 @@ private fun ErrorItem(
                     modifier = Modifier.clearAndSetSemantics { }
                 )
 
-                Spacer(modifier = Modifier.height(WooPosSpacing.XSmall.value.toAdaptivePadding()))
+                Spacer(modifier = Modifier.height(WooPosSpacing.XSmall.value))
 
                 WooPosText(
                     text = item.message,
@@ -838,7 +837,7 @@ private fun ErrorItem(
             if (canRemoveItems) {
                 RemoveItemFromCartButton(item, onUIEvent)
             }
-            Spacer(modifier = Modifier.width(WooPosSpacing.Small.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.width(WooPosSpacing.Small.value))
         }
     }
 }
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosCatalogSyncOverdueBanner.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosCatalogSyncOverdueBanner.kt
index 539a70181605..ef22c901fcf8 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosCatalogSyncOverdueBanner.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosCatalogSyncOverdueBanner.kt
@@ -33,7 +33,6 @@ import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosEle
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTypography
-import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
 
 @Composable
 fun WooPosCatalogSyncOverdueBanner(
@@ -48,7 +47,7 @@ fun WooPosCatalogSyncOverdueBanner(
         WooPosCard(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(horizontal = WooPosSpacing.Medium.value.toAdaptivePadding()),
+                .padding(horizontal = WooPosSpacing.Medium.value),
             shape = RoundedCornerShape(WooPosCornerRadius.Medium.value),
             backgroundColor = MaterialTheme.colorScheme.surfaceContainerLow,
             elevation = WooPosElevation.Medium,
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsList.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsList.kt
index f4c05d75325c..4bbc349e2e8e 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsList.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsList.kt
@@ -54,7 +54,6 @@ import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosEle
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTypography
-import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
 import com.woocommerce.android.ui.woopos.home.items.WooPosItemSelectionViewState.Coupon
 import com.woocommerce.android.ui.woopos.home.items.WooPosItemSelectionViewState.Product
 import com.woocommerce.android.ui.woopos.util.WooPosTestTags
@@ -74,7 +73,7 @@ fun WooPosItemList(
     WooPosLazyColumn(
         modifier = modifier,
         verticalArrangement = Arrangement.spacedBy(WooPosSpacing.Small.value),
-        contentPadding = PaddingValues(vertical = 2.dp),
+        contentPadding = PaddingValues(vertical = WooPosSpacing.XXSmall.value),
         state = listState,
     ) {
         items(
@@ -134,8 +133,7 @@ fun WooPosItemList(
         }
 
         item {
-            @Suppress("WooPosDesignSystemSpacingUsageRule")
-            Spacer(modifier = Modifier.height(104.dp))
+            Spacer(modifier = Modifier.height(WooPosSpacing.Gigantic.value))
         }
     }
     InfiniteListHandler(listState, state, onEndOfProductsListReached)
@@ -348,7 +346,7 @@ private fun CouponInfo(name: String, summary: String, expiredState: Coupon.Expir
             .padding(
                 end = WooPosSpacing.Medium.value,
             )
-            .padding(vertical = WooPosSpacing.Medium.value.toAdaptivePadding()),
+            .padding(vertical = WooPosSpacing.Medium.value),
         verticalArrangement = Arrangement.Center
     ) {
         WooPosText(
@@ -439,7 +437,7 @@ fun WooPosItemsLoadingIndicator(
     WooPosLazyColumn(
         modifier = modifier,
         verticalArrangement = Arrangement.spacedBy(WooPosSpacing.Small.value),
-        contentPadding = PaddingValues(2.dp),
+        contentPadding = PaddingValues(WooPosSpacing.XXSmall.value),
     ) {
         items(itemsCount) {
             ItemsLoadingItem()
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsScreen.kt
index 0ae398220caa..47625a0c6751 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsScreen.kt
@@ -24,7 +24,6 @@ import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosSearch
 import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosSearchUIEvent
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
-import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
 import com.woocommerce.android.ui.woopos.home.items.WooPosItemsToolbarViewState.Tab.Coupons
 import com.woocommerce.android.ui.woopos.home.items.WooPosItemsToolbarViewState.Tab.HighlightLevel
 import com.woocommerce.android.ui.woopos.home.items.WooPosItemsToolbarViewState.Tab.Products
@@ -116,7 +115,7 @@ private fun MainItemsList(
                 modifier = Modifier
                     .statusBarsPadding()
                     .padding(
-                        end = WooPosSpacing.Medium.value.toAdaptivePadding(),
+                        end = WooPosSpacing.Medium.value,
                     ),
                 state = state.value,
                 onTabClicked = onTabClicked,
@@ -129,7 +128,7 @@ private fun MainItemsList(
                 modifier =
                 Modifier
                     .height(WooPosSpacing.Small.value)
-                    .padding(horizontal = WooPosSpacing.Medium.value.toAdaptivePadding())
+                    .padding(horizontal = WooPosSpacing.Medium.value)
             )
 
             WooPosCatalogSyncOverdueBanner(
@@ -151,7 +150,7 @@ private fun MainItemsList(
                 when (screenState) {
                     ScreenState.Products -> WooPosProductsScreen(
                         modifier = Modifier.padding(
-                            horizontal = WooPosSpacing.Medium.value.toAdaptivePadding(),
+                            horizontal = WooPosSpacing.Medium.value,
                         ),
                         listState = productsViewState
                     )
@@ -159,7 +158,7 @@ private fun MainItemsList(
                     ScreenState.ProductsSearch -> WooPosItemsSearchScreen()
                     ScreenState.Coupons -> WooPosCouponsScreen(
                         modifier = Modifier.padding(
-                            horizontal = WooPosSpacing.Medium.value.toAdaptivePadding(),
+                            horizontal = WooPosSpacing.Medium.value,
                         ),
                         listState = couponsListState,
                     )
@@ -167,7 +166,7 @@ private fun MainItemsList(
                     is ScreenState.Variations -> {
                         WooPosVariationsScreen(
                             modifier = Modifier.padding(
-                                horizontal = WooPosSpacing.Medium.value.toAdaptivePadding(),
+                                horizontal = WooPosSpacing.Medium.value,
                             ),
                             variableProductData = screenState.variableProductData,
                             onBackClicked = { onBackClicked() },
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsToolbar.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsToolbar.kt
index ed2ef5eb9df4..8c8c2837dc95 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsToolbar.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsToolbar.kt
@@ -31,7 +31,6 @@ import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosText
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTypography
-import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
 import com.woocommerce.android.ui.woopos.home.items.WooPosItemsToolbarViewState.SearchState
 import com.woocommerce.android.ui.woopos.home.items.variations.WooPosVariationsNavigationData
 import com.woocommerce.android.ui.woopos.util.analytics.WooPosAnalyticsEventConstant
@@ -73,9 +72,9 @@ fun WooPosItemsToolbar(
                         .heightIn(min = WOO_POS_ITEMS_TOOLBAR_HEIGHT),
                     verticalAlignment = Alignment.CenterVertically
                 ) {
-                    Spacer(modifier = Modifier.width(WooPosSpacing.XSmall.value.toAdaptivePadding()))
+                    Spacer(modifier = Modifier.width(WooPosSpacing.XSmall.value))
                     WooPosBackButton { onBackClicked() }
-                    Spacer(modifier = Modifier.width(WooPosSpacing.XSmall.value.toAdaptivePadding()))
+                    Spacer(modifier = Modifier.width(WooPosSpacing.XSmall.value))
 
                     TabsRow(
                         tabs = state.tabs,
@@ -90,7 +89,7 @@ fun WooPosItemsToolbar(
                     modifier = Modifier.fillMaxWidth(),
                     verticalAlignment = Alignment.CenterVertically
                 ) {
-                    Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value.toAdaptivePadding()))
+                    Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value))
 
                     TabsRow(
                         tabs = state.tabs,
@@ -99,7 +98,7 @@ fun WooPosItemsToolbar(
                     )
 
                     if (state is WooPosItemsToolbarViewState.CouponList) {
-                        Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value.toAdaptivePadding()))
+                        Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value))
                         WooPosCircularIconButton(
                             icon = Icons.Default.Add,
                             contentDescription = stringResource(
@@ -107,7 +106,7 @@ fun WooPosItemsToolbar(
                             ),
                             onClick = { onAddCouponEvent() }
                         )
-                        Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value.toAdaptivePadding()))
+                        Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value))
                     }
 
                     when (val search = state.search) {
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/coupons/search/WooPosCouponsEmptySearchQueryStateScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/coupons/search/WooPosCouponsEmptySearchQueryStateScreen.kt
index 4278d9182f38..c0025460bbd0 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/coupons/search/WooPosCouponsEmptySearchQueryStateScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/coupons/search/WooPosCouponsEmptySearchQueryStateScreen.kt
@@ -14,12 +14,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalFocusManager
-import androidx.compose.ui.unit.dp
 import com.woocommerce.android.ui.woopos.common.composeui.WooPosPreview
 import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosRecentSearchesChips
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
-import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
 
 @Composable
 fun WooPosCouponsEmptySearchQueryStateScreen(
@@ -37,7 +35,7 @@ fun WooPosCouponsEmptySearchQueryStateScreen(
     Column(
         modifier
             .fillMaxHeight()
-            .padding(top = WooPosSpacing.Large.value.toAdaptivePadding())
+            .padding(top = WooPosSpacing.Large.value)
             .verticalScroll(scrollState)
     ) {
         if (state.recentSearches.isNotEmpty()) {
@@ -49,8 +47,7 @@ fun WooPosCouponsEmptySearchQueryStateScreen(
             )
         }
 
-        @Suppress("WooPosDesignSystemSpacingUsageRule")
-        Spacer(modifier = Modifier.height(104.dp))
+        Spacer(modifier = Modifier.height(WooPosSpacing.Gigantic.value))
     }
 }
 
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/coupons/search/WooPosCouponsSearchScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/coupons/search/WooPosCouponsSearchScreen.kt
index b14fc212d37c..e02914415002 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/coupons/search/WooPosCouponsSearchScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/coupons/search/WooPosCouponsSearchScreen.kt
@@ -27,7 +27,6 @@ import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosErrorS
 import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosPaginationErrorIndicator
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
-import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
 import com.woocommerce.android.ui.woopos.home.items.WooPosItemList
 import com.woocommerce.android.ui.woopos.home.items.WooPosItemSelectionViewState
 import com.woocommerce.android.ui.woopos.home.items.WooPosItemsLoadingIndicator
@@ -86,7 +85,7 @@ private fun WooPosCouponsSearchScreen(
                     if (state is WooPosCouponsSearchViewState.Content) {
                         WooPosCouponsSearchContent(
                             modifier = Modifier.padding(
-                                horizontal = WooPosSpacing.Medium.value.toAdaptivePadding(),
+                                horizontal = WooPosSpacing.Medium.value,
                             ),
                             listState = listState,
                             state = state,
@@ -100,7 +99,7 @@ private fun WooPosCouponsSearchScreen(
                         modifier = Modifier
                             .fillMaxSize()
                             .padding(
-                                horizontal = WooPosSpacing.Medium.value.toAdaptivePadding(),
+                                horizontal = WooPosSpacing.Medium.value,
                             )
                             .imePadding(),
                         title = stringResource(id = R.string.woopos_search_coupons_empty_title),
@@ -116,7 +115,7 @@ private fun WooPosCouponsSearchScreen(
                         WooPosErrorScreen(
                             modifier = Modifier
                                 .fillMaxSize()
-                                .padding(horizontal = WooPosSpacing.Medium.value.toAdaptivePadding())
+                                .padding(horizontal = WooPosSpacing.Medium.value)
                                 .verticalScroll(rememberScrollState())
                                 .imePadding(),
                             message = stringResource(id = R.string.woopos_search_coupons_error_title),
@@ -132,8 +131,8 @@ private fun WooPosCouponsSearchScreen(
                 WooPosCouponsSearchViewState.Loading::class.java -> {
                     WooPosItemsLoadingIndicator(
                         modifier = Modifier.padding(
-                            start = WooPosSpacing.Medium.value.toAdaptivePadding(),
-                            end = WooPosSpacing.Medium.value.toAdaptivePadding(),
+                            start = WooPosSpacing.Medium.value,
+                            end = WooPosSpacing.Medium.value,
                             top = WooPosSpacing.Large.value
                         ),
                         itemsCount = 5
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/search/WooPosItemsEmptySearchQueryStateScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/search/WooPosItemsEmptySearchQueryStateScreen.kt
index e42ec296e522..bd1058618b7a 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/search/WooPosItemsEmptySearchQueryStateScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/search/WooPosItemsEmptySearchQueryStateScreen.kt
@@ -15,14 +15,12 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
 import com.woocommerce.android.R
 import com.woocommerce.android.ui.woopos.common.composeui.WooPosPreview
 import com.woocommerce.android.ui.woopos.common.composeui.component.SectionHeader
 import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosRecentSearchesChips
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
-import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
 import com.woocommerce.android.ui.woopos.home.items.WooPosItemSelectionViewState
 import com.woocommerce.android.ui.woopos.home.items.WooPosProductCard
 
@@ -42,7 +40,7 @@ fun WooPosItemsEmptySearchQueryStateScreen(
     Column(
         modifier
             .fillMaxHeight()
-            .padding(top = WooPosSpacing.Large.value.toAdaptivePadding())
+            .padding(top = WooPosSpacing.Large.value)
             .verticalScroll(scrollState)
     ) {
         if (state.recentSearches.isNotEmpty()) {
@@ -59,7 +57,7 @@ fun WooPosItemsEmptySearchQueryStateScreen(
             Column(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .padding(horizontal = WooPosSpacing.Medium.value.toAdaptivePadding()),
+                    .padding(horizontal = WooPosSpacing.Medium.value),
             ) {
                 PopularItemsSection(
                     popularItems = state.popularItems,
@@ -70,8 +68,7 @@ fun WooPosItemsEmptySearchQueryStateScreen(
             }
         }
 
-        @Suppress("WooPosDesignSystemSpacingUsageRule")
-        Spacer(modifier = Modifier.height(104.dp))
+        Spacer(modifier = Modifier.height(WooPosSpacing.Gigantic.value))
     }
 }
 
@@ -85,7 +82,7 @@ private fun PopularItemsSection(
             title = stringResource(R.string.woopos_search_popular_items_title)
         )
 
-        Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value))
 
         popularItems.forEach { popularItem ->
             val itemContentDescription = stringResource(
@@ -101,7 +98,7 @@ private fun PopularItemsSection(
                 item = popularItem,
             )
 
-            Spacer(modifier = Modifier.height(WooPosSpacing.Small.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.height(WooPosSpacing.Small.value))
         }
     }
 }
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/search/WooPosItemsSearchScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/search/WooPosItemsSearchScreen.kt
index 1d473cce9e25..be6d7e664e07 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/search/WooPosItemsSearchScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/search/WooPosItemsSearchScreen.kt
@@ -27,7 +27,6 @@ import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosErrorS
 import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosPaginationErrorIndicator
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
-import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
 import com.woocommerce.android.ui.woopos.home.items.WooPosItemList
 import com.woocommerce.android.ui.woopos.home.items.WooPosItemSelectionViewState
 import com.woocommerce.android.ui.woopos.home.items.WooPosItemsLoadingIndicator
@@ -88,7 +87,7 @@ private fun WooPosItemsSearchScreen(
                     if (state is WooPosItemsSearchViewState.Content) {
                         WooPosItemsSearchContent(
                             modifier = Modifier.padding(
-                                horizontal = WooPosSpacing.Medium.value.toAdaptivePadding(),
+                                horizontal = WooPosSpacing.Medium.value,
                             ),
                             listState = listState,
                             state = state,
@@ -102,7 +101,7 @@ private fun WooPosItemsSearchScreen(
                         modifier = Modifier
                             .fillMaxSize()
                             .padding(
-                                horizontal = WooPosSpacing.Medium.value.toAdaptivePadding(),
+                                horizontal = WooPosSpacing.Medium.value,
                             )
                             .imePadding(),
                         title = stringResource(id = R.string.woopos_search_items_empty_title),
@@ -118,7 +117,7 @@ private fun WooPosItemsSearchScreen(
                         WooPosErrorScreen(
                             modifier = Modifier
                                 .fillMaxSize()
-                                .padding(horizontal = WooPosSpacing.Medium.value.toAdaptivePadding())
+                                .padding(horizontal = WooPosSpacing.Medium.value)
                                 .verticalScroll(rememberScrollState())
                                 .imePadding(),
                             message = stringResource(id = R.string.woopos_search_items_error_title),
@@ -134,8 +133,8 @@ private fun WooPosItemsSearchScreen(
                 WooPosItemsSearchViewState.Loading::class.java -> {
                     WooPosItemsLoadingIndicator(
                         modifier = Modifier.padding(
-                            start = WooPosSpacing.Medium.value.toAdaptivePadding(),
-                            end = WooPosSpacing.Medium.value.toAdaptivePadding(),
+                            start = WooPosSpacing.Medium.value,
+                            end = WooPosSpacing.Medium.value,
                             top = WooPosSpacing.Large.value
                         ),
                         itemsCount = 5
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/toolbar/WooPosHomeFloatingToolbar.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/toolbar/WooPosHomeFloatingToolbar.kt
index 8317d2da3e2a..c324c84ba5e4 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/toolbar/WooPosHomeFloatingToolbar.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/toolbar/WooPosHomeFloatingToolbar.kt
@@ -58,7 +58,6 @@ import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosEle
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTypography
-import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
 import com.woocommerce.android.ui.woopos.home.toolbar.WooPosHomeFloatingToolbarState.Menu
 import com.woocommerce.android.ui.woopos.home.toolbar.WooPosHomeFloatingToolbarState.WooPosCardReaderStatus
 
@@ -129,7 +128,7 @@ private fun WooPosFloatingToolbar(
                         onUIEvent = onUIEvent
                     )
 
-                    val marginBetweenCards = WooPosSpacing.Small.value.toAdaptivePadding()
+                    val marginBetweenCards = WooPosSpacing.Small.value
                     PopUpMenu(
                         modifier = Modifier
                             .constrainAs(popupMenu) {
@@ -161,7 +160,7 @@ private fun Toolbar(
 
     ConstraintLayout(modifier = modifier) {
         val (menuCard, cardReaderStatusCard) = createRefs()
-        val marginBetweenCards = WooPosSpacing.Small.value.toAdaptivePadding()
+        val marginBetweenCards = WooPosSpacing.Small.value
 
         CardReaderStatusButton(
             modifier = Modifier
@@ -232,7 +231,7 @@ private fun MenuButtonWithPopUpMenu(
                 repeat(3) {
                     Circle(size = 6.dp, color = MaterialTheme.colorScheme.onSurface)
                     if (it < 2) {
-                        Spacer(modifier = Modifier.height(WooPosSpacing.XSmall.value.toAdaptivePadding()))
+                        Spacer(modifier = Modifier.height(WooPosSpacing.XSmall.value))
                     }
                 }
             }
@@ -252,11 +251,11 @@ private fun PopUpMenu(
         backgroundColor = MaterialTheme.colorScheme.surfaceContainerLow,
     ) {
         Column {
-            Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value))
             menuItems.forEach { menuItem ->
                 PopUpMenuItem(menuItem, onClick)
             }
-            Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value))
         }
     }
 }
@@ -267,17 +266,17 @@ private fun PopUpMenuItem(
     onClick: (Menu.MenuItem) -> Unit
 ) {
     TextButton(onClick = { onClick(menuItem) }) {
-        Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value))
         Icon(
             imageVector = menuItem.icon,
             contentDescription = null,
             tint = MaterialTheme.colorScheme.onSurface,
-            modifier = Modifier.size(WooPosSpacing.Large.value)
+            modifier = Modifier.size(24.dp)
         )
-        Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value))
         WooPosText(
             modifier = Modifier
-                .padding(vertical = WooPosSpacing.Small.value.toAdaptivePadding())
+                .padding(vertical = WooPosSpacing.Small.value)
                 .weight(1f),
             text = stringResource(id = menuItem.title),
             style = WooPosTypography.BodyMedium,
@@ -285,7 +284,7 @@ private fun PopUpMenuItem(
             maxLines = 1,
             overflow = TextOverflow.Ellipsis,
         )
-        Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value))
     }
 }
 
@@ -346,7 +345,7 @@ private fun CardReaderStatusButton(
             TextButton(
                 onClick = onClick,
                 modifier = Modifier
-                    .padding(WooPosSpacing.Small.value.toAdaptivePadding())
+                    .padding(WooPosSpacing.Small.value)
                     .border(
                         width = 2.dp,
                         color = borderColor,
@@ -354,14 +353,14 @@ private fun CardReaderStatusButton(
                     )
                     .height(40.dp),
             ) {
-                Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value.toAdaptivePadding()))
+                Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value))
                 Circle(size = 14.dp, color = illustrationColor)
-                Spacer(modifier = Modifier.width(WooPosSpacing.XSmall.value.toAdaptivePadding()))
+                Spacer(modifier = Modifier.width(WooPosSpacing.XSmall.value))
                 ReaderStatusText(
                     modifier = Modifier.animateContentSize(),
                     title = title,
                 )
-                Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value.toAdaptivePadding()))
+                Spacer(modifier = Modifier.width(WooPosSpacing.Medium.value))
             }
         }
     }
@@ -373,7 +372,7 @@ private fun ReaderStatusText(
     title: String,
 ) {
     WooPosText(
-        modifier = modifier.padding(horizontal = WooPosSpacing.Small.value.toAdaptivePadding()),
+        modifier = modifier.padding(horizontal = WooPosSpacing.Small.value),
         text = title,
         style = WooPosTypography.BodyMedium,
         color = MaterialTheme.colorScheme.onSurface,
@@ -505,7 +504,7 @@ private fun Preview(state: MutableState<WooPosHomeFloatingToolbarState>) {
         ) {
             WooPosFloatingToolbar(
                 modifier = Modifier
-                    .padding(WooPosSpacing.Large.value.toAdaptivePadding())
+                    .padding(WooPosSpacing.Large.value)
                     .align(Alignment.BottomStart),
                 state
             ) {}
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsScreen.kt
index a649836392cf..b1d9ac51ed47 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsScreen.kt
@@ -57,7 +57,6 @@ import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosIco
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTypography
-import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
 import com.woocommerce.android.ui.woopos.home.totals.WooPosTotalsViewState.Totals
 import com.woocommerce.android.ui.woopos.home.totals.payment.failed.WooPosPaymentFailedScreen
 import com.woocommerce.android.ui.woopos.home.totals.payment.inprogress.WooPosPaymentInProgressScreen
@@ -222,8 +221,8 @@ private fun TotalsLoaded(
                         modifier = Modifier
                             .fillMaxWidth()
                             .padding(
-                                horizontal = WooPosSpacing.XLarge.value.toAdaptivePadding(),
-                                vertical = WooPosSpacing.Medium.value.toAdaptivePadding(),
+                                horizontal = WooPosSpacing.XLarge.value,
+                                vertical = WooPosSpacing.Medium.value,
                             ),
                         horizontalAlignment = Alignment.CenterHorizontally,
                     ) {
@@ -232,18 +231,18 @@ private fun TotalsLoaded(
                 }
             }
 
-            Spacer(modifier = Modifier.height(WooPosSpacing.Large.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.height(WooPosSpacing.Large.value))
         }
 
-        Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value))
 
         WooPosOutlinedButton(
             text = stringResource(R.string.woopos_payment_take_cash_payment_label),
             onClick = { onUIEvent(WooPosTotalsUIEvent.OnCashPaymentClicked) },
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(horizontal = WooPosSpacing.XLarge.value.toAdaptivePadding())
-                .padding(bottom = WooPosSpacing.XLarge.value.toAdaptivePadding())
+                .padding(horizontal = WooPosSpacing.XLarge.value)
+                .padding(bottom = WooPosSpacing.XLarge.value)
                 .testTag(WooPosTestTags.CASH_PAYMENT_BUTTON)
         )
     }
@@ -252,13 +251,13 @@ private fun TotalsLoaded(
 @Composable
 private fun PreparingReader(title: String, subtitle: String) {
     WooPosCircularLoadingIndicator(modifier = Modifier.size(160.dp))
-    Spacer(modifier = Modifier.height(WooPosSpacing.Large.value.toAdaptivePadding()))
+    Spacer(modifier = Modifier.height(WooPosSpacing.Large.value))
     WooPosText(
         text = title,
         style = WooPosTypography.BodyLarge,
         color = WooPosTheme.colors.onSurfaceVariantHighest,
     )
-    Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value.toAdaptivePadding()))
+    Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value))
     WooPosText(
         text = subtitle,
         style = WooPosTypography.Heading,
@@ -275,19 +274,19 @@ private fun ReaderReadyForPayment(readerStatus: WooPosTotalsViewState.ReaderStat
         clipSpec = LottieClipSpec.Markers("reader_awaiting_start", "reader_awaiting_end"),
         iterations = LottieConstants.IterateForever,
     )
-    Spacer(modifier = Modifier.height(WooPosSpacing.Large.value.toAdaptivePadding()))
+    Spacer(modifier = Modifier.height(WooPosSpacing.Large.value))
     WooPosText(
         text = readerStatus.title,
         style = WooPosTypography.BodyLarge,
         color = WooPosTheme.colors.onSurfaceVariantHighest,
     )
-    Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value.toAdaptivePadding()))
+    Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value))
     WooPosText(
         text = readerStatus.subtitle,
         style = WooPosTypography.Heading,
         fontWeight = FontWeight.Bold,
         textAlign = TextAlign.Center,
-        modifier = Modifier.padding(horizontal = WooPosSpacing.XLarge.value.toAdaptivePadding())
+        modifier = Modifier.padding(horizontal = WooPosSpacing.XLarge.value)
     )
 }
 
@@ -298,7 +297,7 @@ private fun ReaderDisconnected(
     onUIEvent: (WooPosTotalsUIEvent) -> Unit,
 ) {
     Column(
-        modifier = modifier.padding(WooPosSpacing.XLarge.value.toAdaptivePadding()),
+        modifier = modifier.padding(WooPosSpacing.XLarge.value),
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.SpaceEvenly,
     ) {
@@ -308,7 +307,7 @@ private fun ReaderDisconnected(
             contentDescription = stringResource(id = R.string.woopos_reader_not_connected_description),
         )
 
-        Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value))
 
         WooPosText(
             text = status.title,
@@ -316,13 +315,13 @@ private fun ReaderDisconnected(
             fontWeight = FontWeight.Bold,
         )
 
-        Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value))
 
         WooPosText(
             text = status.subtitle,
             style = WooPosTypography.BodyLarge,
         )
-        Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value))
         WooPosButton(
             text = status.actionButtonLabel,
             onClick = { onUIEvent(WooPosTotalsUIEvent.ConnectReaderClicked) },
@@ -337,7 +336,7 @@ private fun ReaderDisconnected(
 private fun TotalsGrid(totals: Totals.Visible) {
     Column(
         modifier = Modifier
-            .padding(WooPosSpacing.Large.value.toAdaptivePadding())
+            .padding(WooPosSpacing.Large.value)
             .fillMaxWidth(0.5f),
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.Center,
@@ -348,7 +347,7 @@ private fun TotalsGrid(totals: Totals.Visible) {
             colorOne = WooPosTheme.colors.onSurfaceVariantHighest
         )
 
-        Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value))
 
         totals.orderDiscountText?.let {
             TotalsGridRow(
@@ -357,7 +356,7 @@ private fun TotalsGrid(totals: Totals.Visible) {
                 colorOne = WooPosTheme.colors.onSurfaceVariantHighest,
             )
 
-            Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value))
         }
 
         TotalsGridRow(
@@ -366,11 +365,11 @@ private fun TotalsGrid(totals: Totals.Visible) {
             colorOne = WooPosTheme.colors.onSurfaceVariantHighest
         )
 
-        Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value))
 
         HorizontalDivider(color = MaterialTheme.colorScheme.outlineVariant, thickness = 1.dp)
 
-        Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value))
 
         TotalsGridRow(
             textOne = stringResource(R.string.woopos_payment_total_label),
@@ -427,21 +426,21 @@ private fun TotalsLoading() {
         ) {
             WooPosShimmerBox(
                 modifier = Modifier
-                    .height(WooPosSpacing.Large.value)
+                    .height(24.dp)
                     .width(332.dp)
                     .clip(RoundedCornerShape(WooPosCornerRadius.Small.value))
             )
 
-            Spacer(modifier = Modifier.height(WooPosSpacing.Large.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.height(WooPosSpacing.Large.value))
 
             WooPosShimmerBox(
                 modifier = Modifier
-                    .height(WooPosSpacing.Large.value)
+                    .height(24.dp)
                     .width(332.dp)
                     .clip(RoundedCornerShape(WooPosCornerRadius.Small.value))
             )
 
-            Spacer(modifier = Modifier.height(WooPosSpacing.Large.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.height(WooPosSpacing.Large.value))
 
             WooPosShimmerBox(
                 modifier = Modifier
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/payment/failed/WooPosTotalsPaymentFailedScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/payment/failed/WooPosTotalsPaymentFailedScreen.kt
index cd2b4006e62a..f1b1245d584a 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/payment/failed/WooPosTotalsPaymentFailedScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/payment/failed/WooPosTotalsPaymentFailedScreen.kt
@@ -24,7 +24,6 @@ import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosIco
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTypography
-import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
 import com.woocommerce.android.ui.woopos.home.totals.WooPosTotalsUIEvent
 import com.woocommerce.android.ui.woopos.home.totals.WooPosTotalsViewState
 
@@ -39,29 +38,28 @@ fun WooPosPaymentFailedScreen(
     Column(
         modifier = Modifier
             .fillMaxSize()
-            .padding(vertical = 96.dp.toAdaptivePadding()),
+            .padding(vertical = WooPosSpacing.Huge.value),
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
-        @Suppress("WooPosDesignSystemSpacingUsageRule")
-        Spacer(modifier = Modifier.height(96.dp.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.Huge.value))
         Icon(
             modifier = Modifier.size(84.dp),
             imageVector = WooPosIcons.ErrorX,
             contentDescription = stringResource(id = R.string.woopos_error_icon_content_description),
             tint = WooPosTheme.colors.unspecified,
         )
-        Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value))
         WooPosText(
             text = state.title,
             style = WooPosTypography.BodyXLarge,
             fontWeight = FontWeight.Bold
         )
-        Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value))
         WooPosText(
             text = state.subtitle,
             style = WooPosTypography.BodyLarge,
         )
-        Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value))
         WooPosButton(
             text = state.retryPaymentButtonLabel,
             modifier = Modifier
@@ -69,15 +67,14 @@ fun WooPosPaymentFailedScreen(
                 .width(604.dp)
         ) { onUIEvent(WooPosTotalsUIEvent.RetryFailedTransactionClicked) }
         if (state.isReturnToCheckoutButtonVisible) {
-            Spacer(modifier = Modifier.height(WooPosSpacing.Large.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.height(WooPosSpacing.Large.value))
             WooPosOutlinedButton(
                 modifier = Modifier
                     .width(604.dp),
                 text = stringResource(R.string.woo_pos_payment_failed_go_back_to_checkout),
             ) { onUIEvent(WooPosTotalsUIEvent.GoBackToCheckoutAfterFailedPayment) }
         }
-        @Suppress("WooPosDesignSystemSpacingUsageRule")
-        Spacer(modifier = Modifier.height(80.dp.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.Huge.value))
     }
 }
 
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/payment/inprogress/WooPosTotalsPaymentInProgressScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/payment/inprogress/WooPosTotalsPaymentInProgressScreen.kt
index ab554956c063..6281664cd737 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/payment/inprogress/WooPosTotalsPaymentInProgressScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/payment/inprogress/WooPosTotalsPaymentInProgressScreen.kt
@@ -27,7 +27,6 @@ import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosText
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTypography
-import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
 import com.woocommerce.android.ui.woopos.home.totals.WooPosTotalsUIEvent
 import com.woocommerce.android.ui.woopos.home.totals.WooPosTotalsViewState
 
@@ -50,7 +49,7 @@ fun WooPosPaymentInProgressScreen(
             horizontalAlignment = Alignment.CenterHorizontally,
             verticalArrangement = Arrangement.Center,
         ) {
-            Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value))
             val composition by rememberLottieComposition(LottieCompositionSpec.RawRes(R.raw.woopos_card_ilustration))
             LottieAnimation(
                 modifier = Modifier.size(256.dp),
@@ -59,14 +58,14 @@ fun WooPosPaymentInProgressScreen(
                 clipToCompositionBounds = false,
                 clipSpec = LottieClipSpec.Markers("payment_processing_start", "payment_processing_end")
             )
-            Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value))
             Column(horizontalAlignment = Alignment.CenterHorizontally) {
                 WooPosText(
                     text = state.title,
                     color = MaterialTheme.colorScheme.onPrimary,
                     style = WooPosTypography.BodyLarge,
                 )
-                Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value.toAdaptivePadding()))
+                Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value))
                 WooPosText(
                     text = state.subtitle,
                     color = MaterialTheme.colorScheme.onPrimary,
@@ -75,7 +74,7 @@ fun WooPosPaymentInProgressScreen(
                 )
             }
         }
-        Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value))
     }
 }
 
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/payment/success/WooPosTotalsPaymentSuccessScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/payment/success/WooPosTotalsPaymentSuccessScreen.kt
index 86c99f85e26f..b43dbfc35380 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/payment/success/WooPosTotalsPaymentSuccessScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/payment/success/WooPosTotalsPaymentSuccessScreen.kt
@@ -36,7 +36,6 @@ import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosIco
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTypography
-import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
 import com.woocommerce.android.ui.woopos.home.totals.WooPosTotalsViewState
 import com.woocommerce.android.ui.woopos.util.WooPosTestTags
 import kotlinx.coroutines.delay
@@ -92,15 +91,19 @@ private fun WooPosPaymentSuccessScreen(
             .background(MaterialTheme.colorScheme.surfaceBright),
         contentAlignment = Alignment.Center
     ) {
+        val hugeSpacing = WooPosSpacing.Huge.value
+        val mediumSpacing = WooPosSpacing.Medium.value
         val marginBetweenButtonAndText by animateDpAsState(
-            targetValue = if (animationStage >= AnimationStage.BUTTONS) 80.dp else WooPosSpacing.Medium.value,
+            targetValue = if (animationStage >= AnimationStage.BUTTONS) hugeSpacing else mediumSpacing,
             label = "Check mark size"
         )
+        val checkMarkIconMargin = WooPosSpacing.XXXLarge.value
+        val textsMargin = WooPosSpacing.Small.value
+
         @Suppress("DestructuringDeclarationWithTooManyEntries")
         ConstraintLayout {
             val (icon, title, message, buttonNewOrder, buttonEmailReceipts) = createRefs()
 
-            val checkMarkIconMargin = 56.dp.toAdaptivePadding()
             CheckMarkIcon(
                 animationStage = animationStage,
                 modifier = Modifier.constrainAs(icon) {
@@ -110,7 +113,6 @@ private fun WooPosPaymentSuccessScreen(
                 }
             )
 
-            val textsMargin = WooPosSpacing.Small.value.toAdaptivePadding()
             WooPosText(
                 text = stringResource(R.string.woopos_payment_successful_label),
                 style = WooPosTypography.Heading,
@@ -123,8 +125,6 @@ private fun WooPosPaymentSuccessScreen(
                     bottom.linkTo(message.top, margin = textsMargin)
                 }
             )
-
-            val marginBetweenButtonAndTextAdaptive = marginBetweenButtonAndText.toAdaptivePadding()
             WooPosText(
                 text = state.orderTotalText,
                 style = WooPosTypography.BodyLarge,
@@ -133,11 +133,11 @@ private fun WooPosPaymentSuccessScreen(
                 modifier = Modifier.constrainAs(message) {
                     start.linkTo(parent.start)
                     end.linkTo(parent.end)
-                    bottom.linkTo(buttonNewOrder.top, margin = marginBetweenButtonAndTextAdaptive)
+                    bottom.linkTo(buttonNewOrder.top, margin = marginBetweenButtonAndText)
                 }
             )
 
-            val marginBetweenButtons = WooPosSpacing.Medium.value.toAdaptivePadding()
+            val marginBetweenButtons = WooPosSpacing.Medium.value
             WooPosButton(
                 modifier = Modifier
                     .constrainAs(buttonNewOrder) {
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersDetails.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersDetails.kt
index 4a3a68a5e122..7be36f3d7b4f 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersDetails.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersDetails.kt
@@ -170,10 +170,13 @@ private fun OrdersProducts(lineItems: List<WooPosOrdersState.OrderDetailsViewSta
 @Composable
 @Suppress("DestructuringDeclarationWithTooManyEntries")
 private fun OrderProductItem(row: WooPosOrdersState.OrderDetailsViewState.Computed.Details.LineItemRow) {
+    val marginMedium = WooPosSpacing.Medium.value
+    val marginSmall = WooPosSpacing.Small.value
+    val marginXSmall = WooPosSpacing.XSmall.value
     ConstraintLayout(
         modifier = Modifier
             .fillMaxWidth()
-            .padding(vertical = WooPosSpacing.Small.value)
+            .padding(vertical = marginSmall)
     ) {
         val (image, nameText, qtyText, totalText) = createRefs()
 
@@ -191,8 +194,8 @@ private fun OrderProductItem(row: WooPosOrdersState.OrderDetailsViewState.Comput
             fontWeight = FontWeight.Bold,
             modifier = Modifier.constrainAs(nameText) {
                 top.linkTo(image.top)
-                start.linkTo(image.end, margin = WooPosSpacing.Medium.value)
-                end.linkTo(totalText.start, margin = WooPosSpacing.Small.value)
+                start.linkTo(image.end, margin = marginMedium)
+                end.linkTo(totalText.start, margin = marginSmall)
                 width = Dimension.fillToConstraints
             }
         )
@@ -202,9 +205,9 @@ private fun OrderProductItem(row: WooPosOrdersState.OrderDetailsViewState.Comput
             style = WooPosTypography.BodyMedium,
             color = WooPosTheme.colors.onSurfaceVariantHighest,
             modifier = Modifier.constrainAs(qtyText) {
-                top.linkTo(nameText.bottom, margin = WooPosSpacing.XSmall.value)
+                top.linkTo(nameText.bottom, margin = marginXSmall)
                 start.linkTo(nameText.start)
-                end.linkTo(totalText.start, margin = WooPosSpacing.Small.value)
+                end.linkTo(totalText.start, margin = marginSmall)
                 width = Dimension.fillToConstraints
             }
         )
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersLoadingScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersLoadingScreen.kt
index af1eb58dc496..00010cc55826 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersLoadingScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersLoadingScreen.kt
@@ -238,10 +238,13 @@ private fun OrderDetailsLoadingPane(modifier: Modifier = Modifier) {
 @Composable
 @Suppress("DestructuringDeclarationWithTooManyEntries")
 private fun ProductLoadingItem() {
+    val marginSmall = WooPosSpacing.Small.value
+    val marginMedium = WooPosSpacing.Medium.value
+
     ConstraintLayout(
         modifier = Modifier
             .fillMaxWidth()
-            .padding(vertical = WooPosSpacing.Small.value)
+            .padding(vertical = marginSmall)
     ) {
         val (image, nameShimmer, qtyShimmer, totalShimmer) = createRefs()
 
@@ -261,7 +264,7 @@ private fun ProductLoadingItem() {
             fontWeight = FontWeight.Bold,
             modifier = Modifier.constrainAs(nameShimmer) {
                 top.linkTo(image.top)
-                start.linkTo(image.end, margin = WooPosSpacing.Medium.value)
+                start.linkTo(image.end, margin = marginMedium)
             }
         )
 
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/scanningsetup/WooPosScanningSetupDialog.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/scanningsetup/WooPosScanningSetupDialog.kt
index e1990ed1331a..00123d9e9707 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/scanningsetup/WooPosScanningSetupDialog.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/scanningsetup/WooPosScanningSetupDialog.kt
@@ -83,7 +83,6 @@ import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosIco
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTypography
-import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
 import com.woocommerce.android.ui.woopos.common.composeui.modifier.listenForBarcodes
 import com.woocommerce.android.ui.woopos.common.data.WOO_POS_BARCODE_DOC_URL
 import com.woocommerce.android.ui.woopos.scanningsetup.WooPosScanningSetupState.BarcodeReaderDevice
@@ -143,7 +142,7 @@ fun WooPosScanningSetupDialog(
         Column(
             modifier = Modifier
                 .background(color = MaterialTheme.colorScheme.surfaceBright)
-                .padding(WooPosSpacing.XLarge.value.toAdaptivePadding())
+                .padding(WooPosSpacing.XLarge.value)
                 .listenForBarcodes(
                     { barcodeResult ->
                         viewModel.onUiEvent(WooPosScanningSetupUiEvent.OnBarcodeScanned(barcodeResult))
@@ -168,7 +167,7 @@ fun WooPosScanningSetupDialog(
                 }
             }
 
-            Spacer(modifier = Modifier.size(WooPosSpacing.XLarge.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.size(WooPosSpacing.XLarge.value))
 
             AnimatedContent(
                 targetState = state.currentStep,
@@ -296,7 +295,7 @@ private fun ScannerModeSetupContent(
             style = WooPosTypography.Heading,
             fontWeight = FontWeight.Bold,
             textAlign = TextAlign.Center,
-            modifier = Modifier.padding(bottom = WooPosSpacing.Medium.value.toAdaptivePadding())
+            modifier = Modifier.padding(bottom = WooPosSpacing.Medium.value)
         )
 
         WooPosText(
@@ -305,14 +304,14 @@ private fun ScannerModeSetupContent(
             textAlign = TextAlign.Center,
         )
 
-        Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value.toAdaptivePadding()))
-        Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value))
+        Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value))
 
         Box(
             modifier = Modifier
                 .clip(RoundedCornerShape(WooPosCornerRadius.Medium.value))
                 .background(Color.White)
-                .padding(WooPosSpacing.Medium.value.toAdaptivePadding()),
+                .padding(WooPosSpacing.Medium.value),
             contentAlignment = Alignment.Center
         ) {
             Image(
@@ -323,8 +322,8 @@ private fun ScannerModeSetupContent(
             )
         }
 
-        Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value.toAdaptivePadding()))
-        Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value))
+        Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value))
 
         SetupButtonsRow(
             primaryButtonText = primaryButtonText,
@@ -354,14 +353,14 @@ private fun TestScannerContent(
             style = WooPosTypography.Heading,
             fontWeight = FontWeight.Bold,
             textAlign = TextAlign.Center,
-            modifier = Modifier.padding(bottom = WooPosSpacing.Medium.value.toAdaptivePadding())
+            modifier = Modifier.padding(bottom = WooPosSpacing.Medium.value)
         )
 
         WooPosText(
             text = message,
             style = WooPosTypography.BodyLarge,
             textAlign = TextAlign.Center,
-            modifier = Modifier.padding(bottom = WooPosSpacing.Large.value.toAdaptivePadding())
+            modifier = Modifier.padding(bottom = WooPosSpacing.Large.value)
         )
 
         Box(
@@ -369,7 +368,7 @@ private fun TestScannerContent(
                 .size(300.dp, 150.dp)
                 .clip(RoundedCornerShape(WooPosCornerRadius.Medium.value))
                 .background(Color.White)
-                .padding(WooPosSpacing.Medium.value.toAdaptivePadding()),
+                .padding(WooPosSpacing.Medium.value),
             contentAlignment = Alignment.Center
         ) {
             BarcodeEAN13Code(
@@ -379,7 +378,7 @@ private fun TestScannerContent(
             )
         }
 
-        Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value))
 
         WooPosOutlinedButton(
             onClick = onSecondaryClick,
@@ -405,10 +404,10 @@ private fun TestYourScannerScanFailedContent(
             imageVector = WooPosIcons.ErrorX,
             contentDescription = null,
             modifier = Modifier
-                .padding(WooPosSpacing.Medium.value.toAdaptivePadding()),
+                .padding(WooPosSpacing.Medium.value),
         )
 
-        Spacer(modifier = Modifier.height(WooPosSpacing.Large.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.Large.value))
 
         WooPosText(
             text = stringResource(step.titleRes),
@@ -417,7 +416,7 @@ private fun TestYourScannerScanFailedContent(
             textAlign = TextAlign.Center,
         )
 
-        Spacer(modifier = Modifier.height(WooPosSpacing.Small.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.Small.value))
 
         WooPosText(
             text = stringResource(step.messageRes),
@@ -425,8 +424,8 @@ private fun TestYourScannerScanFailedContent(
             textAlign = TextAlign.Center,
         )
 
-        Spacer(modifier = Modifier.size(WooPosSpacing.XLarge.value.toAdaptivePadding()))
-        Spacer(modifier = Modifier.size(WooPosSpacing.XLarge.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.size(WooPosSpacing.XLarge.value))
+        Spacer(modifier = Modifier.size(WooPosSpacing.XLarge.value))
 
         SetupButtonsRow(
             primaryButtonText = stringResource(step.primaryButtonTextRes),
@@ -454,10 +453,10 @@ private fun PairYourScannerContent(
             imageVector = WooPosIcons.BluetoothSettings,
             contentDescription = null,
             modifier = Modifier
-                .padding(WooPosSpacing.Medium.value.toAdaptivePadding()),
+                .padding(WooPosSpacing.Medium.value),
         )
 
-        Spacer(modifier = Modifier.height(WooPosSpacing.Large.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.Large.value))
 
         WooPosText(
             text = stringResource(step.titleRes),
@@ -466,7 +465,7 @@ private fun PairYourScannerContent(
             textAlign = TextAlign.Center,
         )
 
-        Spacer(modifier = Modifier.height(WooPosSpacing.Small.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.Small.value))
 
         WooPosText(
             text = step.messageRes.getText(),
@@ -474,7 +473,7 @@ private fun PairYourScannerContent(
             textAlign = TextAlign.Center,
         )
 
-        Spacer(modifier = Modifier.size(WooPosSpacing.Large.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.size(WooPosSpacing.Large.value))
 
         WooPosText(
             text = stringResource(step.bluetoothSettingsButtonTextRes),
@@ -488,13 +487,13 @@ private fun PairYourScannerContent(
                     onClick = { onOpenBluetoothSettings() }
                 )
                 .padding(
-                    horizontal = WooPosSpacing.Medium.value.toAdaptivePadding(),
-                    vertical = WooPosSpacing.Small.value.toAdaptivePadding()
+                    horizontal = WooPosSpacing.Medium.value,
+                    vertical = WooPosSpacing.Small.value
                 )
         )
 
-        Spacer(modifier = Modifier.size(WooPosSpacing.Large.value.toAdaptivePadding()))
-        Spacer(modifier = Modifier.size(WooPosSpacing.XLarge.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.size(WooPosSpacing.Large.value))
+        Spacer(modifier = Modifier.size(WooPosSpacing.XLarge.value))
 
         SetupButtonsRow(
             primaryButtonText = stringResource(step.primaryButtonTextRes),
@@ -520,21 +519,21 @@ private fun DeviceSelectionContent(
             style = WooPosTypography.Heading,
             fontWeight = FontWeight.Bold,
             textAlign = TextAlign.Center,
-            modifier = Modifier.padding(bottom = WooPosSpacing.Medium.value.toAdaptivePadding())
+            modifier = Modifier.padding(bottom = WooPosSpacing.Medium.value)
         )
 
         WooPosText(
             text = stringResource(id = R.string.woopos_scanning_setup_device_selection_message),
             style = WooPosTypography.BodyLarge,
             textAlign = TextAlign.Center,
-            modifier = Modifier.padding(bottom = WooPosSpacing.XLarge.value.toAdaptivePadding())
+            modifier = Modifier.padding(bottom = WooPosSpacing.XLarge.value)
         )
 
         Column(
             modifier = Modifier
                 .fillMaxWidth()
                 .verticalScroll(rememberScrollState()),
-            verticalArrangement = Arrangement.spacedBy(WooPosSpacing.Medium.value.toAdaptivePadding())
+            verticalArrangement = Arrangement.spacedBy(WooPosSpacing.Medium.value)
         ) {
             step.devices.forEach { device ->
                 DeviceSelectionItem(
@@ -563,7 +562,7 @@ private fun DeviceSelectionItem(
                 shape = RoundedCornerShape(WooPosCornerRadius.Medium.value)
             )
             .clickable { onClick() }
-            .padding(WooPosSpacing.Large.value.toAdaptivePadding()),
+            .padding(WooPosSpacing.Large.value),
         contentAlignment = Alignment.Center
     ) {
         WooPosText(
@@ -584,7 +583,7 @@ private fun SetupButtonsRow(
 ) {
     Row(
         modifier = Modifier.fillMaxWidth(),
-        horizontalArrangement = Arrangement.spacedBy(WooPosSpacing.Medium.value.toAdaptivePadding())
+        horizontalArrangement = Arrangement.spacedBy(WooPosSpacing.Medium.value)
     ) {
         WooPosOutlinedButton(
             onClick = onSecondaryClick,
@@ -614,7 +613,7 @@ private fun ScannerSetupSuccessContent(
     ) {
         ScannerSetupSuccessIcon()
 
-        Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value))
 
         WooPosText(
             text = stringResource(step.titleRes),
@@ -623,7 +622,7 @@ private fun ScannerSetupSuccessContent(
             textAlign = TextAlign.Center,
         )
 
-        Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value))
 
         WooPosText(
             text = stringResource(step.messageRes),
@@ -631,8 +630,8 @@ private fun ScannerSetupSuccessContent(
             textAlign = TextAlign.Center,
         )
 
-        Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value.toAdaptivePadding()))
-        Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value))
+        Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value))
 
         WooPosOutlinedButton(
             onClick = onPrimaryClick,
@@ -680,7 +679,7 @@ private fun ScannerSetupBarcodesOnProductsContent(
             style = WooPosTypography.Heading,
             fontWeight = FontWeight.Bold,
             textAlign = TextAlign.Center,
-            modifier = Modifier.padding(bottom = WooPosSpacing.Medium.value.toAdaptivePadding())
+            modifier = Modifier.padding(bottom = WooPosSpacing.Medium.value)
         )
 
         val visitDocumentationText = stringResource(id = R.string.woopos_scanning_setup_visit_documentation)
@@ -715,9 +714,9 @@ private fun ScannerSetupBarcodesOnProductsContent(
             style = WooPosTypography.BodyLarge,
             textAlign = TextAlign.Center,
             modifier = Modifier.padding(
-                bottom = WooPosSpacing.Large.value.toAdaptivePadding(),
-                start = WooPosSpacing.XLarge.value.toAdaptivePadding(),
-                end = WooPosSpacing.XLarge.value.toAdaptivePadding(),
+                bottom = WooPosSpacing.Large.value,
+                start = WooPosSpacing.XLarge.value,
+                end = WooPosSpacing.XLarge.value,
             )
         )
 
@@ -736,7 +735,7 @@ private fun ScannerSetupBarcodesOnProductsContent(
                 )
         )
 
-        Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value.toAdaptivePadding()))
+        Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value))
 
         SetupButtonsRow(
             primaryButtonText = stringResource(step.doneButtonTextRes),
@@ -764,7 +763,7 @@ private fun ScannerSetupInfoContent(
             style = WooPosTypography.Heading,
             fontWeight = FontWeight.Bold,
             textAlign = TextAlign.Center,
-            modifier = Modifier.padding(bottom = WooPosSpacing.XLarge.value.toAdaptivePadding())
+            modifier = Modifier.padding(bottom = WooPosSpacing.XLarge.value)
         )
 
         WooPosText(
@@ -772,15 +771,15 @@ private fun ScannerSetupInfoContent(
             style = WooPosTypography.BodyLarge,
             textAlign = TextAlign.Start,
             modifier = Modifier
-                .padding(bottom = WooPosSpacing.XLarge.value.toAdaptivePadding())
+                .padding(bottom = WooPosSpacing.XLarge.value)
                 .fillMaxWidth()
         )
 
         Column(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(bottom = WooPosSpacing.Large.value.toAdaptivePadding()),
-            verticalArrangement = Arrangement.spacedBy(WooPosSpacing.Small.value.toAdaptivePadding())
+                .padding(bottom = WooPosSpacing.Large.value),
+            verticalArrangement = Arrangement.spacedBy(WooPosSpacing.Small.value)
         ) {
             step.bulletPointsRes.forEach { bulletPointRes ->
                 BulletPointItem(text = stringResource(bulletPointRes))
@@ -793,7 +792,7 @@ private fun ScannerSetupInfoContent(
             textAlign = TextAlign.Start,
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(bottom = WooPosSpacing.XLarge.value.toAdaptivePadding())
+                .padding(bottom = WooPosSpacing.XLarge.value)
         )
 
         SetupButtonsRow(
@@ -869,9 +868,9 @@ private fun SoftwareKeyboardSetupContent(
             }
         )
 
-        val marginMedium = WooPosSpacing.Medium.value.toAdaptivePadding()
-        val marginLarge = WooPosSpacing.Large.value.toAdaptivePadding()
-        val marginSmall = WooPosSpacing.Small.value.toAdaptivePadding()
+        val marginMedium = WooPosSpacing.Medium.value
+        val marginLarge = WooPosSpacing.Large.value
+        val marginSmall = WooPosSpacing.Small.value
         WooPosText(
             text = stringResource(step.messageRes),
             style = WooPosTypography.BodyLarge,
@@ -919,7 +918,7 @@ private fun SoftwareKeyboardSetupContent(
                         end.linkTo(parent.end, margin = marginMedium)
                         width = Dimension.fillToConstraints
                     },
-                verticalArrangement = Arrangement.spacedBy(WooPosSpacing.Small.value.toAdaptivePadding())
+                verticalArrangement = Arrangement.spacedBy(WooPosSpacing.Small.value)
             ) {
                 WooPosText(
                     text = stringResource(step.messageTwoRes),
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/settings/details/localcatalog/WooPosSettingsLocalCatalogScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/settings/details/localcatalog/WooPosSettingsLocalCatalogScreen.kt
index 76f49ca545b3..29ed1f86a768 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/settings/details/localcatalog/WooPosSettingsLocalCatalogScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/settings/details/localcatalog/WooPosSettingsLocalCatalogScreen.kt
@@ -48,7 +48,6 @@ import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosIco
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTypography
-import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
 import com.woocommerce.android.ui.woopos.settings.details.WooPosSettingsDetailsMenuItemInfo
 
 @Composable
@@ -159,6 +158,9 @@ private fun CellularDataSection(
     onToggleCellularData: (Boolean) -> Unit,
     isLoading: Boolean
 ) {
+    val marginMedium = WooPosSpacing.Medium.value
+    val marginSmall = WooPosSpacing.Small.value
+
     WooPosCard(
         modifier = Modifier.fillMaxWidth()
     ) {
@@ -168,7 +170,7 @@ private fun CellularDataSection(
                 .clickable(enabled = !isLoading) {
                     onToggleCellularData(!allowCellularDataUpdate)
                 }
-                .padding(WooPosSpacing.Medium.value)
+                .padding(marginMedium)
         ) {
             val (title, subtitle, switch) = createRefs()
 
@@ -180,7 +182,7 @@ private fun CellularDataSection(
                 modifier = Modifier.constrainAs(title) {
                     top.linkTo(parent.top)
                     start.linkTo(parent.start)
-                    end.linkTo(switch.start, margin = WooPosSpacing.Medium.value)
+                    end.linkTo(switch.start, margin = marginMedium)
                     width = Dimension.fillToConstraints
                 }
             )
@@ -190,9 +192,9 @@ private fun CellularDataSection(
                 style = WooPosTypography.BodyMedium,
                 color = MaterialTheme.colorScheme.onSurface,
                 modifier = Modifier.constrainAs(subtitle) {
-                    top.linkTo(title.bottom, margin = WooPosSpacing.Small.value)
+                    top.linkTo(title.bottom, margin = marginSmall)
                     start.linkTo(parent.start)
-                    end.linkTo(switch.start, margin = WooPosSpacing.Medium.value)
+                    end.linkTo(switch.start, margin = marginMedium)
                     width = Dimension.fillToConstraints
                 }
             )
@@ -220,13 +222,16 @@ private fun ManualUpdateSection(
     catalogStatus: WooPosSettingsLocalCatalogState.CatalogStatus,
     onRefreshCatalog: () -> Unit
 ) {
+    val marginMedium = WooPosSpacing.Medium.value
+    val marginSmall = WooPosSpacing.Small.value
+
     WooPosCard(
         modifier = Modifier.fillMaxWidth()
     ) {
         ConstraintLayout(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(WooPosSpacing.Medium.value)
+                .padding(marginMedium)
         ) {
             val (title, subtitle, button) = createRefs()
 
@@ -238,7 +243,7 @@ private fun ManualUpdateSection(
                 modifier = Modifier.constrainAs(title) {
                     top.linkTo(parent.top)
                     start.linkTo(parent.start)
-                    end.linkTo(button.start, margin = WooPosSpacing.Medium.value)
+                    end.linkTo(button.start, margin = marginMedium)
                     width = Dimension.fillToConstraints
                 }
             )
@@ -248,9 +253,9 @@ private fun ManualUpdateSection(
                 style = WooPosTypography.BodyMedium,
                 color = MaterialTheme.colorScheme.onSurface,
                 modifier = Modifier.constrainAs(subtitle) {
-                    top.linkTo(title.bottom, margin = WooPosSpacing.Small.value)
+                    top.linkTo(title.bottom, margin = marginSmall)
                     start.linkTo(parent.start)
-                    end.linkTo(button.start, margin = WooPosSpacing.Medium.value)
+                    end.linkTo(button.start, margin = marginMedium)
                     width = Dimension.fillToConstraints
                 }
             )
@@ -310,7 +315,7 @@ fun WooPosSyncErrorDialog(
         Column(
             modifier = Modifier
                 .background(color = MaterialTheme.colorScheme.surfaceBright)
-                .padding(WooPosSpacing.XLarge.value.toAdaptivePadding())
+                .padding(WooPosSpacing.XLarge.value)
         ) {
             Row {
                 Spacer(modifier = Modifier.weight(1f))
@@ -329,7 +334,7 @@ fun WooPosSyncErrorDialog(
                 }
             }
 
-            Spacer(modifier = Modifier.size(WooPosSpacing.XLarge.value.toAdaptivePadding()))
+            Spacer(modifier = Modifier.size(WooPosSpacing.XLarge.value))
 
             Column(
                 modifier = Modifier
@@ -341,10 +346,10 @@ fun WooPosSyncErrorDialog(
                     imageVector = WooPosIcons.ErrorX,
                     contentDescription = null,
                     modifier = Modifier
-                        .padding(WooPosSpacing.Medium.value.toAdaptivePadding())
+                        .padding(WooPosSpacing.Medium.value)
                 )
 
-                Spacer(modifier = Modifier.height(WooPosSpacing.Large.value.toAdaptivePadding()))
+                Spacer(modifier = Modifier.height(WooPosSpacing.Large.value))
 
                 WooPosText(
                     text = stringResource(R.string.woopos_settings_local_catalog_sync_error_dialog_title),
@@ -353,7 +358,7 @@ fun WooPosSyncErrorDialog(
                     color = MaterialTheme.colorScheme.onSurface
                 )
 
-                Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value.toAdaptivePadding()))
+                Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value))
 
                 WooPosText(
                     text = stringResource(R.string.woopos_settings_local_catalog_sync_error_dialog_message),
@@ -361,7 +366,7 @@ fun WooPosSyncErrorDialog(
                     color = MaterialTheme.colorScheme.onSurface
                 )
 
-                Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value.toAdaptivePadding()))
+                Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value))
 
                 WooPosButton(
                     modifier = Modifier.fillMaxWidth(),
@@ -369,7 +374,7 @@ fun WooPosSyncErrorDialog(
                     text = stringResource(R.string.woopos_settings_local_catalog_sync_error_dialog_retry_button)
                 )
 
-                Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value.toAdaptivePadding()))
+                Spacer(modifier = Modifier.height(WooPosSpacing.Medium.value))
 
                 WooPosOutlinedButton(
                     modifier = Modifier.fillMaxWidth(),
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/settings/productinfo/WooPosSettingsProductInfoDialog.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/settings/productinfo/WooPosSettingsProductInfoDialog.kt
index 1d8d9c5abe22..5e66476797f3 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/settings/productinfo/WooPosSettingsProductInfoDialog.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/settings/productinfo/WooPosSettingsProductInfoDialog.kt
@@ -19,7 +19,6 @@ import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
 import androidx.constraintlayout.compose.ConstraintLayout
 import androidx.constraintlayout.compose.Dimension
 import com.woocommerce.android.R
@@ -31,7 +30,6 @@ import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosCor
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTypography
-import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
 
 @Composable
 fun WooPosSettingsProductInfoDialog(
@@ -55,7 +53,7 @@ fun WooPosSettingsProductInfoDialog(
         Box(
             modifier = Modifier
                 .background(MaterialTheme.colorScheme.surfaceBright)
-                .padding(WooPosSpacing.XLarge.value.toAdaptivePadding())
+                .padding(WooPosSpacing.XLarge.value)
                 .semantics(mergeDescendants = true) {
                     contentDescription = dialogContentDescription
                 },
@@ -73,8 +71,8 @@ fun WooPosSettingsProductInfoDialog(
 
                     modifier = Modifier
                         .padding(
-                            top = WooPosSpacing.XLarge.value.toAdaptivePadding(),
-                            bottom = WooPosSpacing.Medium.value.toAdaptivePadding()
+                            top = WooPosSpacing.XLarge.value,
+                            bottom = WooPosSpacing.Medium.value
                         )
                         .constrainAs(header) {
                             top.linkTo(closeIcon.bottom)
@@ -96,16 +94,15 @@ fun WooPosSettingsProductInfoDialog(
                         text = stringResource(id = state.primaryMessage),
                         style = WooPosTypography.BodyLarge,
                         textAlign = TextAlign.Center,
-                        modifier = Modifier.padding(bottom = WooPosSpacing.Medium.value.toAdaptivePadding())
+                        modifier = Modifier.padding(bottom = WooPosSpacing.Medium.value)
                     )
                     WooPosText(
                         text = stringResource(id = state.secondaryMessage),
                         style = WooPosTypography.BodyLarge,
                         textAlign = TextAlign.Center,
-                        modifier = Modifier.padding(bottom = WooPosSpacing.Medium.value.toAdaptivePadding())
+                        modifier = Modifier.padding(bottom = WooPosSpacing.Medium.value)
                     )
-                    @Suppress("WooPosDesignSystemSpacingUsageRule")
-                    Spacer(Modifier.height(40.dp.toAdaptivePadding()))
+                    Spacer(Modifier.height(WooPosSpacing.XXLarge.value))
                     Box(
                         Modifier
                             .clip(RoundedCornerShape(WooPosCornerRadius.Medium.value))
@@ -113,8 +110,8 @@ fun WooPosSettingsProductInfoDialog(
                                 color = MaterialTheme.colorScheme.surfaceDim
                             )
                             .padding(
-                                vertical = WooPosSpacing.XLarge.value.toAdaptivePadding(),
-                                horizontal = WooPosSpacing.Medium.value.toAdaptivePadding()
+                                vertical = WooPosSpacing.XLarge.value,
+                                horizontal = WooPosSpacing.Medium.value
                             ),
                         contentAlignment = Alignment.Center,
                     ) {
@@ -129,7 +126,7 @@ fun WooPosSettingsProductInfoDialog(
                             )
                         }
                     }
-                    Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value.toAdaptivePadding()))
+                    Spacer(modifier = Modifier.height(WooPosSpacing.XLarge.value))
                     WooPosOutlinedButton(
                         onClick = { onDismissRequest() },
                         text = stringResource(id = state.primaryButton.label),
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/splash/WooPosSplashScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/splash/WooPosSplashScreen.kt
index 46484194bc76..bbd9ec8c1f02 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/splash/WooPosSplashScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/splash/WooPosSplashScreen.kt
@@ -27,7 +27,6 @@ import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosErrorS
 import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosErrorScreenButtonState
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing
 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTheme
-import com.woocommerce.android.ui.woopos.common.composeui.designsystem.toAdaptivePadding
 import com.woocommerce.android.ui.woopos.root.navigation.WooPosNavigationEvent
 
 @Composable
@@ -107,7 +106,7 @@ private fun SyncingCatalog(
         Column(
             modifier = Modifier
                 .align(Alignment.BottomCenter)
-                .padding(bottom = WooPosSpacing.XLarge.value.toAdaptivePadding()),
+                .padding(bottom = WooPosSpacing.XLarge.value),
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
             TextButton(