diff --git a/css/admin.less b/css/admin.less
index 86b5a0803..a613fbfb9 100644
--- a/css/admin.less
+++ b/css/admin.less
@@ -250,8 +250,9 @@
 					ul li.so-row-colors-container {
 						clear: both;
 						display: flex;
-						justify-content: space-around;
-
+						flex-wrap: wrap;
+						gap: 4px;
+						justify-content: space-evenly;
 						padding: 5px;
 
 						.so-row-color {
@@ -361,6 +362,10 @@
 						.transition(0.25s, background, ease-in-out);
 					}
 
+					&.cell-selected .cell-wrapper {
+						background: #a4cadd;
+
+					}
 					.so-live-editor-builder &.so-show-icon .widgets-container .so-widget:hover,
 					&.so-show-icon.so-small-actions .widgets-container .so-widget:hover {
 						.so-widget-wrapper {
@@ -629,6 +634,10 @@
 						height: 100%;
 
 						.transition(0.25s, background, ease-in-out);
+
+						&:hover {
+							background: #dcebf2;
+						}
 					}
 
 					&:first-child {
diff --git a/readme.txt b/readme.txt
index d665172ed..65493948b 100644
--- a/readme.txt
+++ b/readme.txt
@@ -107,6 +107,9 @@ SiteOrigin Premium includes access to our professional email support service, pe
 
 == Changelog ==
 
+= 2.18.4 - 13 November 2022 =
+* Admin Row Colors: Adjusted swatches layout and spacing.
+
 = 2.18.3 - 09 November 2022 =
 * Styles: Added viewport units of measurement.
 * Updated `Tested up to` tag to 6.1.