diff --git a/modules/theme-tools/site-logo/css/site-logo-control-rtl.css b/modules/theme-tools/site-logo/css/site-logo-control-rtl.css
index d5441db12454e..e0d9a2c43f8c8 100644
--- a/modules/theme-tools/site-logo/css/site-logo-control-rtl.css
+++ b/modules/theme-tools/site-logo/css/site-logo-control-rtl.css
@@ -1,6 +1,37 @@
+/* Do not modify this file directly.  It is concatenated from individual module CSS files. */
 /**
- * RTL styles for the Site Logo control. Just swaps the button sides.
+ * Styles for the Site Logo control.
  */
+#customize-control-site_logo .current {
+	margin-bottom: 6px;
+}
+
+#customize-control-site_logo .current span {
+	border: 1px solid #eee;
+	border-radius:         2px;
+	color: #555;
+	display: block;
+	overflow: hidden;
+	line-height: 40px;
+	min-height: 40px;
+	padding: 0 6px;
+	text-align: center;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+#customize-control-site_logo .current img {
+	max-width: 100%;
+}
+
+#customize-control-site_logo button.new,
+#customize-control-site_logo button.change,
+#customize-control-site_logo button.remove {
+	height: auto;
+	width: 48%;
+	white-space: normal;
+}
+
 #customize-control-site_logo .remove {
 	float: right;
 	margin-left: 3px;
@@ -10,3 +41,9 @@
 #customize-control-site_logo .change {
 	float: left;
 }
+
+#customize-control-site_logo .customize-control-description {
+	display: block;
+	clear: both;
+	margin-bottom: 10px;
+}
\ No newline at end of file
diff --git a/modules/theme-tools/site-logo/css/site-logo-control-rtl.min.css b/modules/theme-tools/site-logo/css/site-logo-control-rtl.min.css
index 1893fe9cef411..f07c2f740a1b0 100644
--- a/modules/theme-tools/site-logo/css/site-logo-control-rtl.min.css
+++ b/modules/theme-tools/site-logo/css/site-logo-control-rtl.min.css
@@ -1 +1 @@
-#customize-control-site_logo .remove{float:right;margin-left:3px}#customize-control-site_logo .change,#customize-control-site_logo .new{float:left}
\ No newline at end of file
+#customize-control-site_logo .current{margin-bottom:6px}#customize-control-site_logo .current span{border:1px solid #eee;border-radius:2px;color:#555;display:block;overflow:hidden;line-height:40px;min-height:40px;padding:0 6px;text-align:center;text-overflow:ellipsis;white-space:nowrap}#customize-control-site_logo .current img{max-width:100%}#customize-control-site_logo button.change,#customize-control-site_logo button.new,#customize-control-site_logo button.remove{height:auto;width:48%;white-space:normal}#customize-control-site_logo .remove{float:right;margin-left:3px}#customize-control-site_logo .change,#customize-control-site_logo .new{float:left}#customize-control-site_logo .customize-control-description{display:block;clear:both;margin-bottom:10px}
\ No newline at end of file
diff --git a/modules/theme-tools/site-logo/css/site-logo-control.min.css b/modules/theme-tools/site-logo/css/site-logo-control.min.css
index 7fcee5ae0f008..0c1eede3a0424 100644
--- a/modules/theme-tools/site-logo/css/site-logo-control.min.css
+++ b/modules/theme-tools/site-logo/css/site-logo-control.min.css
@@ -1 +1,2 @@
-#customize-control-site_logo .current{margin-bottom:6px}#customize-control-site_logo .current span{border:1px solid #eee;-webkit-border-radius:2px;border-radius:2px;color:#555;display:block;overflow:hidden;line-height:40px;min-height:40px;padding:0 6px;text-align:center;text-overflow:ellipsis;white-space:nowrap}#customize-control-site_logo .current img{max-width:100%}#customize-control-site_logo button.change,#customize-control-site_logo button.new,#customize-control-site_logo button.remove{height:auto;width:48%;white-space:normal}#customize-control-site_logo .remove{float:left;margin-right:3px}#customize-control-site_logo .change,#customize-control-site_logo .new{float:right}#customize-control-site_logo .customize-control-description{display:block;clear:both;margin-bottom:10px}
\ No newline at end of file
+/* Do not modify this file directly.  It is concatenated from individual module CSS files. */
+#customize-control-site_logo .current{margin-bottom:6px}#customize-control-site_logo .current span{border:1px solid #eee;border-radius:2px;color:#555;display:block;overflow:hidden;line-height:40px;min-height:40px;padding:0 6px;text-align:center;text-overflow:ellipsis;white-space:nowrap}#customize-control-site_logo .current img{max-width:100%}#customize-control-site_logo button.change,#customize-control-site_logo button.new,#customize-control-site_logo button.remove{height:auto;width:48%;white-space:normal}#customize-control-site_logo .remove{float:left;margin-right:3px}#customize-control-site_logo .change,#customize-control-site_logo .new{float:right}#customize-control-site_logo .customize-control-description{display:block;clear:both;margin-bottom:10px}
\ No newline at end of file
diff --git a/modules/theme-tools/site-logo/inc/class-site-logo-control.php b/modules/theme-tools/site-logo/inc/class-site-logo-control.php
index 5e23507d445f5..209cc0007f639 100644
--- a/modules/theme-tools/site-logo/inc/class-site-logo-control.php
+++ b/modules/theme-tools/site-logo/inc/class-site-logo-control.php
@@ -54,8 +54,27 @@ public function enqueue() {
 		// Enqueues all needed media resources.
 		wp_enqueue_media();
 
-		// Enqueue our control script and styles.
-		wp_enqueue_style( 'site-logo-control', plugins_url( '../css/site-logo-control.css', __FILE__ ) );
+		/*
+		 * Enqueue our control script and styles.
+		 */
+
+		// We only enqueue a minified version of the file on prod. Jetpack.
+		$min = (
+			( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG )
+			|| ( defined( 'IS_WPCOM' ) && IS_WPCOM )
+		)
+			? ''
+			: '.min';
+
+		wp_enqueue_style(
+			'site-logo-control',
+			plugins_url( '../css/site-logo-control.css', __FILE__ ),
+			array(),
+			JETPACK__VERSION
+		);
+		wp_style_add_data( 'site-logo-control', 'rtl', 'replace' );
+		wp_style_add_data( 'site-logo-control', 'suffix', $min );
+
 		wp_enqueue_script( 'site-logo-control', plugins_url( '../js/site-logo-control.js', __FILE__ ), array( 'media-views', 'customize-controls', 'underscore' ), '', true );
 	}
 
diff --git a/tools/builder/admin-css.js b/tools/builder/admin-css.js
index 1de7e934f27a8..ad93dd1e8f869 100644
--- a/tools/builder/admin-css.js
+++ b/tools/builder/admin-css.js
@@ -28,6 +28,7 @@ const admincss = [
 	'modules/post-by-email/post-by-email.css',
 	'modules/protect/protect-dashboard-widget.css',
 	'modules/sharedaddy/admin-sharing.css',
+	'modules/theme-tools/site-logo/css/site-logo-control.css',
 	'modules/videopress/videopress-admin.css',
 	'modules/videopress/css/editor.css',
 	'modules/videopress/css/videopress-editor-style.css',