diff --git a/platform/execution-impl/src/com/intellij/execution/impl/EditConfigurationsDialog.java b/platform/execution-impl/src/com/intellij/execution/impl/EditConfigurationsDialog.java
index 44c71d81729c..7cb25b49a6a2 100644
--- a/platform/execution-impl/src/com/intellij/execution/impl/EditConfigurationsDialog.java
+++ b/platform/execution-impl/src/com/intellij/execution/impl/EditConfigurationsDialog.java
@@ -17,6 +17,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.ui.components.JBOptionButton;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.concurrency.AppExecutorUtil;
+import com.intellij.util.ui.JBUI;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -136,6 +137,7 @@ public class EditConfigurationsDialog extends SingleConfigurableEditor {
     if (action == myRunAction) {
       JBOptionButton button = new JBOptionButton(action, null);
       button.setAddSeparator(false);
+      button.setIconTextGap(JBUI.CurrentTheme.ActionsList.elementIconGap());
       return button;
     }
     return super.createJButtonForAction(action);
diff --git a/platform/platform-impl/src/com/intellij/ui/components/BasicOptionButtonUI.kt b/platform/platform-impl/src/com/intellij/ui/components/BasicOptionButtonUI.kt
index 2fbcbd008b63..3e526371f065 100644
--- a/platform/platform-impl/src/com/intellij/ui/components/BasicOptionButtonUI.kt
+++ b/platform/platform-impl/src/com/intellij/ui/components/BasicOptionButtonUI.kt
@@ -181,6 +181,7 @@ open class BasicOptionButtonUI : OptionButtonUI() {
       "action" -> mainButton.action = optionButton.action
       TEXT_CHANGED_PROPERTY -> mainButton.text = optionButton.text
       ICON_CHANGED_PROPERTY -> mainButton.icon = optionButton.icon
+      "iconTextGap" -> mainButton.iconTextGap = optionButton.iconTextGap
       MNEMONIC_CHANGED_PROPERTY -> mainButton.mnemonic = optionButton.mnemonic
       TOOL_TIP_TEXT_KEY, PROP_OPTION_TOOLTIP -> updateTooltip()
       PROP_OPTIONS -> {