diff --git a/src/plugins/controls/public/react_controls/control_group/components/control_group.tsx b/src/plugins/controls/public/react_controls/control_group/components/control_group.tsx
index a9b23316bf83f..f6259ddc95149 100644
--- a/src/plugins/controls/public/react_controls/control_group/components/control_group.tsx
+++ b/src/plugins/controls/public/react_controls/control_group/components/control_group.tsx
@@ -96,7 +96,7 @@ export function ControlGroup({
   const ApplyButtonComponent = useMemo(() => {
     return (
       <EuiButtonIcon
-        size="m"
+        size="s"
         disabled={!hasUnappliedSelections}
         iconSize="m"
         display="fill"
diff --git a/src/plugins/controls/public/react_controls/control_group/components/control_panel.scss b/src/plugins/controls/public/react_controls/control_group/components/control_panel.scss
index 4987a58275237..6c25854aa97cc 100644
--- a/src/plugins/controls/public/react_controls/control_group/components/control_panel.scss
+++ b/src/plugins/controls/public/react_controls/control_group/components/control_panel.scss
@@ -16,7 +16,7 @@
     .controlPanel--label {
       @include euiTextTruncate;
       padding: 0;
-      height: $euiButtonHeightSmall;
+      height: 100%;
     }
   }
 
@@ -39,3 +39,33 @@
 .controlFrame__dragHandle {
   line-height: 0; // Vertically center the grab handle
 }
+
+.controlFrame__formControlLayout:not(.controlFrame__formControlLayout--edit):not(.controlFrame__formControlLayout--twoLine) {
+  .euiFormControlLayout__prepend {
+    padding-inline-start: $euiSizeS;
+  }
+}
+
+.controlFrame__formControlLayout:not(.controlFrame__formControlLayout--edit).timeSlider {
+  .euiFormControlLayout__prepend {
+    padding-inline-start: 0;
+  }
+}
+
+.controlFrame__formControlLayout.controlFrame__formControlLayout--twoLine.controlFrame__formControlLayout--edit {
+  .euiFormControlLayout__prepend {
+    padding-inline-end: 0;
+  }
+}
+
+.controlFrame__formControlLayout.controlFrame__formControlLayout--twoLine:not(.controlFrame__formControlLayout--edit) {
+  .euiFormControlLayout__prepend {
+    padding-inline: 0;
+  }
+}
+
+.controlFrame__formControlLayout:not(.controlFrame__formControlLayout--twoLine).controlFrame__formControlLayout--edit {
+  .euiFormControlLayout__prepend {
+    padding-inline-start: $euiSizeXS * .5; // skinny icon
+  }
+}
\ No newline at end of file
diff --git a/src/plugins/controls/public/react_controls/control_group/components/control_panel.tsx b/src/plugins/controls/public/react_controls/control_group/components/control_panel.tsx
index 577f8d1c2682d..cbb7bf09fdab7 100644
--- a/src/plugins/controls/public/react_controls/control_group/components/control_panel.tsx
+++ b/src/plugins/controls/public/react_controls/control_group/components/control_panel.tsx
@@ -56,9 +56,7 @@ const DragHandle = ({
     >
       <EuiIcon type="grabHorizontal" />
     </button>
-  ) : hideEmptyDragHandle ? null : (
-    <EuiIcon size="s" type="empty" />
-  );
+  ) : null;
 
 export const ControlPanel = <ApiType extends DefaultControlApi = DefaultControlApi>({
   Component,
@@ -115,6 +113,7 @@ export const ControlPanel = <ApiType extends DefaultControlApi = DefaultControlA
     viewModeSubject
   );
   const usingTwoLineLayout = labelPosition === 'twoLine';
+  const controlType = api ? api.type : null;
 
   const [initialLoadComplete, setInitialLoadComplete] = useState(!dataLoading);
   if (!initialLoadComplete && (dataLoading === false || (api && !api.dataLoading))) {
@@ -164,7 +163,14 @@ export const ControlPanel = <ApiType extends DefaultControlApi = DefaultControlA
             fullWidth
             isLoading={Boolean(dataLoading)}
             compressed
-            className="controlFrame__formControlLayout"
+            className={classNames(
+              'controlFrame__formControlLayout',
+              {
+                'controlFrame__formControlLayout--twoLine': usingTwoLineLayout,
+                'controlFrame__formControlLayout--edit': isEditable,
+              },
+              `${controlType}`
+            )}
             prepend={
               <>
                 <DragHandle