diff --git a/src/wp-admin/css/customize-controls.css b/src/wp-admin/css/customize-controls.css
index 2b4e87daa7ce7..3e0a929311d6b 100644
--- a/src/wp-admin/css/customize-controls.css
+++ b/src/wp-admin/css/customize-controls.css
@@ -1641,6 +1641,10 @@ p.customize-section-description {
 	margin-right: 8px;
 }
 
+#customize-control-site_icon .remove-button {
+	margin-right: 8px;
+}
+
 /* Background position control */
 .customize-control-background_position .background-position-control .button-group {
 	display: block;
diff --git a/src/wp-includes/customize/class-wp-customize-site-icon-control.php b/src/wp-includes/customize/class-wp-customize-site-icon-control.php
index e8dd34070d74c..06ca295a79b61 100644
--- a/src/wp-includes/customize/class-wp-customize-site-icon-control.php
+++ b/src/wp-includes/customize/class-wp-customize-site-icon-control.php
@@ -58,12 +58,10 @@ public function content_template() {
 		<# if ( data.attachment && data.attachment.id ) { #>
 			<div class="attachment-media-view">
 				<# if ( data.attachment.sizes ) { #>
-					<style>
-						:root{
-							--site-icon-url: url( '{{ data.attachment.sizes.full ? data.attachment.sizes.full.url : data.attachment.url }}' );
-						}
-					</style>
-					<div class="site-icon-preview customizer">
+					<div
+						class="site-icon-preview customizer"
+						style="--site-icon-url: url( '{{ data.attachment.sizes.full ? data.attachment.sizes.full.url : data.attachment.url }}' );"
+					>
 						<div class="direction-wrap">
 							<img src="{{ data.attachment.sizes.full ? data.attachment.sizes.full.url : data.attachment.url }}" class="app-icon-preview" alt="{{
 								data.attachment.alt ?
@@ -115,13 +113,13 @@ public function content_template() {
 							</div>
 						</div>
 					</div>
+					<div class="actions">
+						<# if ( data.canUpload ) { #>
+							<button type="button" class="button remove-button"><?php echo $this->button_labels['remove']; ?></button>
+							<button type="button" class="button upload-button"><?php echo $this->button_labels['change']; ?></button>
+						<# } #>
+					</div>
 				<# } #>
-				<div class="actions">
-					<# if ( data.canUpload ) { #>
-						<button type="button" class="button remove-button"><?php echo $this->button_labels['remove']; ?></button>
-						<button type="button" class="button upload-button"><?php echo $this->button_labels['change']; ?></button>
-					<# } #>
-				</div>
 			</div>
 		<# } else { #>
 			<div class="attachment-media-view">