From d311624626d3df268491b57972acde3faf666a1a Mon Sep 17 00:00:00 2001
From: Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com>
Date: Fri, 20 Feb 2026 17:29:19 +0100
Subject: [PATCH 1/2] Icon Block: Clean up selectors config

---
 packages/block-library/src/icon/block.json | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/packages/block-library/src/icon/block.json b/packages/block-library/src/icon/block.json
index 910cca0c8c9598..65b685bfc33087 100644
--- a/packages/block-library/src/icon/block.json
+++ b/packages/block-library/src/icon/block.json
@@ -59,19 +59,9 @@
 		}
 	},
 	"selectors": {
-		"root": ".wp-block-icon",
-		"color": {
-			"root": ".wp-block-icon svg"
-		},
-		"border": {
-			"root": ".wp-block-icon svg"
-		},
+		"root": ".wp-block-icon svg",
 		"spacing": {
-			"padding": ".wp-block-icon svg"
-		},
-		"dimensions": {
-			"root": ".wp-block-icon svg",
-			"width": ".wp-block-icon svg"
+			"margin": ".wp-block-icon"
 		}
 	},
 	"style": "wp-block-icon",

From c1b8a03f6cb962eac92391edde3dc5c2a74b0624 Mon Sep 17 00:00:00 2001
From: Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com>
Date: Sat, 21 Feb 2026 21:50:31 +0100
Subject: [PATCH 2/2] Make block wrapper base selector for custom css

---
 packages/block-library/src/icon/block.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/block-library/src/icon/block.json b/packages/block-library/src/icon/block.json
index 65b685bfc33087..23d0f10dc4b260 100644
--- a/packages/block-library/src/icon/block.json
+++ b/packages/block-library/src/icon/block.json
@@ -60,6 +60,7 @@
 	},
 	"selectors": {
 		"root": ".wp-block-icon svg",
+		"css": ".wp-block-icon",
 		"spacing": {
 			"margin": ".wp-block-icon"
 		}