Fix icon and tile padding for color theme picker

Accidentally left out the final design changes from prior cl

Bug: 250889939
Test: manually verified spacing
Change-Id: I2c7d86caeb6807fee995b3c08767bffba2b6674e
diff --git a/res/values-w600dp-port/dimens.xml b/res/values-w600dp-port/dimens.xml
index 112e396..62a9946 100644
--- a/res/values-w600dp-port/dimens.xml
+++ b/res/values-w600dp-port/dimens.xml
@@ -18,8 +18,6 @@
     <!-- Dimensions for the customization option tiles -->
     <dimen name="option_tile_width">79dp</dimen>
     <dimen name="option_tile_linear_padding_horizontal">8dp</dimen>
-    <dimen name="option_tile_grid_icon_padding_min">8dp</dimen>
-    <dimen name="option_tile_grid_tile_padding_min">4dp</dimen>
 
     <dimen name="component_color_chip_small_radius_default">30dp</dimen>
     <dimen name="component_color_chip_small_diameter_default">60dp</dimen>
diff --git a/res/values-w800dp/dimens.xml b/res/values-w800dp/dimens.xml
index bdbf7d4..6ba900e 100644
--- a/res/values-w800dp/dimens.xml
+++ b/res/values-w800dp/dimens.xml
@@ -18,6 +18,4 @@
     <!-- Dimensions for the customization option tiles -->
     <dimen name="option_tile_width">87dp</dimen>
     <dimen name="option_tile_linear_padding_horizontal">8dp</dimen>
-    <dimen name="option_tile_grid_icon_padding_min">8dp</dimen>
-    <dimen name="option_tile_grid_tile_padding_min">4dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 3bb0df8..64d9941 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -40,10 +40,10 @@
     <dimen name="option_tile_padding_horizontal">12dp</dimen>
     <!-- Spacing between tiles in linear layout -->
     <dimen name="option_tile_linear_padding_horizontal">4dp</dimen>
-    <!-- Minimum padding around tile icon in grid layout -->
-    <dimen name="option_tile_grid_icon_padding_min">8dp</dimen>
     <!-- Minimum padding around entire tile in grid layout -->
     <dimen name="option_tile_grid_tile_padding_min">2dp</dimen>
+    <!-- Minimum padding around icon within tile in grid layout -->
+    <dimen name="option_tile_grid_icon_padding_min">4dp</dimen>
     <dimen name="option_icon_size">16dp</dimen>
     <dimen name="theme_option_icon_sample_height">22dp</dimen>
     <dimen name="theme_option_icon_sample_width">22dp</dimen>