diff --git a/src/Gui/Dialogs/DlgMacroExecute.ui b/src/Gui/Dialogs/DlgMacroExecute.ui
index c2bdb3e9a331..1660fd24857b 100644
--- a/src/Gui/Dialogs/DlgMacroExecute.ui
+++ b/src/Gui/Dialogs/DlgMacroExecute.ui
@@ -6,17 +6,23 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>640</width>
+    <width>740</width>
     <height>480</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Execute Macro</string>
+   <string>Macros</string>
+  </property>
+  <property name="minimumWidth">
+   <number>740</number>
   </property>
   <property name="modal">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout">
+  <layout class="QVBoxLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
    <property name="leftMargin">
     <number>9</number>
    </property>
@@ -29,166 +35,141 @@
    <property name="bottomMargin">
     <number>9</number>
    </property>
-   <property name="spacing">
-    <number>6</number>
-   </property>
-   <item row="0" column="0">
-    <layout class="QGridLayout">
-     <property name="leftMargin">
-      <number>0</number>
-     </property>
-     <property name="topMargin">
-      <number>0</number>
-     </property>
-     <property name="rightMargin">
-      <number>0</number>
-     </property>
-     <property name="bottomMargin">
-      <number>0</number>
-     </property>
+   <item>
+    <layout class="QHBoxLayout">
      <property name="spacing">
       <number>6</number>
      </property>
-     <item row="0" column="0">
-      <widget class="QGroupBox" name="MacroNameGroup">
-       <property name="title">
-        <string>Macro Name</string>
+     <!-- Left: search + list + selected macro name -->
+     <item>
+      <layout class="QVBoxLayout">
+       <property name="spacing">
+        <number>6</number>
        </property>
-       <layout class="QGridLayout">
-        <property name="leftMargin">
-         <number>9</number>
-        </property>
-        <property name="topMargin">
-         <number>9</number>
-        </property>
-        <property name="rightMargin">
-         <number>9</number>
-        </property>
-        <property name="bottomMargin">
-         <number>9</number>
-        </property>
-        <property name="spacing">
-         <number>6</number>
-        </property>
-        <item row="0" column="0">
-         <widget class="QLineEdit" name="LineEditMacroName">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <layout class="QHBoxLayout">
-          <item>
-           <widget class="QLabel" name="label">
-            <property name="text">
-             <string>Find file</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLineEdit" name="LineEditFind">
-            <property name="toolTip">
-             <string>Case-insensitive search for filenames, regular expressions supported</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="label1">
-            <property name="text">
-             <string>Find in files</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLineEdit" name="LineEditFindInFiles">
-            <property name="toolTip">
-             <string>Filter by file content, case-insensitive. Regular expressions are supported.</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item row="2" column="0">
-         <widget class="QTabWidget" name="tabMacroWidget">
-          <property name="tabPosition">
-           <enum>QTabWidget::North</enum>
-          </property>
-          <property name="currentIndex">
-           <number>0</number>
-          </property>
-          <widget class="QWidget" name="userSpecificTab">
-           <attribute name="title">
-            <string>User macros</string>
-           </attribute>
-           <layout class="QVBoxLayout" name="verticalLayout_2">
-            <item>
-             <widget class="QTreeWidget" name="userMacroListBox">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="rootIsDecorated">
-               <bool>false</bool>
-              </property>
-              <column>
-               <property name="text">
-                <string notr="true">1</string>
-               </property>
-              </column>
-             </widget>
-            </item>
-           </layout>
+       <item>
+        <layout class="QHBoxLayout">
+         <item>
+          <widget class="QLabel" name="label">
+           <property name="text">
+            <string>Find file</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="LineEditFind">
+           <property name="toolTip">
+            <string>Case-insensitive search for filenames, regular expressions supported</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label1">
+           <property name="text">
+            <string>Find in files</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="LineEditFindInFiles">
+           <property name="toolTip">
+            <string>Filter by file content, case-insensitive. Regular expressions are supported.</string>
+           </property>
           </widget>
-          <widget class="QWidget" name="systemWideTag">
-           <attribute name="title">
-            <string>System macros</string>
-           </attribute>
-           <layout class="QVBoxLayout" name="verticalLayout">
-            <item>
-             <widget class="QTreeWidget" name="systemMacroListBox">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QTabWidget" name="tabMacroWidget">
+         <property name="minimumWidth">
+          <number>520</number>
+         </property>
+         <property name="styleSheet">
+          <string>QTabBar::tab { min-width: 150px; padding-left: 10px; padding-right: 10px; }</string>
+         </property>
+         <property name="tabPosition">
+          <enum>QTabWidget::North</enum>
+         </property>
+         <property name="currentIndex">
+          <number>0</number>
+         </property>
+         <widget class="QWidget" name="userSpecificTab">
+          <attribute name="title">
+           <string>User macros</string>
+          </attribute>
+          <layout class="QVBoxLayout" name="verticalLayout_2">
+           <item>
+            <widget class="QTreeWidget" name="userMacroListBox">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="rootIsDecorated">
+              <bool>false</bool>
+             </property>
+             <column>
+              <property name="text">
+               <string notr="true">1</string>
               </property>
-              <property name="rootIsDecorated">
-               <bool>false</bool>
+             </column>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+         <widget class="QWidget" name="systemWideTag">
+          <attribute name="title">
+           <string>System macros</string>
+          </attribute>
+          <layout class="QVBoxLayout" name="verticalLayout">
+           <item>
+            <widget class="QTreeWidget" name="systemMacroListBox">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="rootIsDecorated">
+              <bool>false</bool>
+             </property>
+             <column>
+              <property name="text">
+               <string notr="true">1</string>
               </property>
-              <column>
-               <property name="text">
-                <string notr="true">1</string>
-               </property>
-              </column>
-             </widget>
-            </item>
-           </layout>
-          </widget>
+             </column>
+            </widget>
+           </item>
+          </layout>
          </widget>
-        </item>
-       </layout>
-      </widget>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout">
+         <item>
+          <widget class="QLabel" name="labelMacroName">
+           <property name="text">
+            <string>Selected:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="LineEditMacroName">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
      </item>
-     <item row="0" column="1">
+     <!-- Right: button column -->
+     <item>
       <layout class="QVBoxLayout">
        <property name="spacing">
         <number>6</number>
        </property>
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
        <item>
         <widget class="QPushButton" name="executeButton">
          <property name="enabled">
@@ -200,27 +181,20 @@
         </widget>
        </item>
        <item>
-        <widget class="QPushButton" name="closeButton">
-         <property name="text">
-          <string>Close</string>
+        <widget class="QLabel" name="line1">
+         <property name="minimumHeight">
+          <number>4</number>
          </property>
-        </widget>
-       </item>
-       <item>
-        <spacer>
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
+         <property name="maximumHeight">
+          <number>4</number>
          </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Expanding</enum>
+         <property name="styleSheet">
+          <string>QLabel { background-color: #aaaaaa; }</string>
          </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>77</width>
-           <height>34</height>
-          </size>
+         <property name="text">
+          <string/>
          </property>
-        </spacer>
+        </widget>
        </item>
        <item>
         <widget class="QPushButton" name="createButton">
@@ -233,42 +207,58 @@
         </widget>
        </item>
        <item>
-        <widget class="QPushButton" name="deleteButton">
+        <widget class="QPushButton" name="editButton">
          <property name="enabled">
           <bool>false</bool>
          </property>
          <property name="text">
-          <string>Delete</string>
+          <string>Edit</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QPushButton" name="editButton">
+        <widget class="QPushButton" name="renameButton">
          <property name="enabled">
           <bool>false</bool>
          </property>
          <property name="text">
-          <string>Edit</string>
+          <string>Rename</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QPushButton" name="renameButton">
+        <widget class="QPushButton" name="duplicateButton">
          <property name="enabled">
           <bool>false</bool>
          </property>
          <property name="text">
-          <string>Rename</string>
+          <string>Duplicate</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QPushButton" name="duplicateButton">
+        <widget class="QPushButton" name="deleteButton">
          <property name="enabled">
           <bool>false</bool>
          </property>
          <property name="text">
-          <string>Duplicate</string>
+          <string>Delete</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="line2">
+         <property name="minimumHeight">
+          <number>4</number>
+         </property>
+         <property name="maximumHeight">
+          <number>4</number>
+         </property>
+         <property name="styleSheet">
+          <string>QLabel { background-color: #aaaaaa; }</string>
+         </property>
+         <property name="text">
+          <string/>
          </property>
         </widget>
        </item>
@@ -285,11 +275,27 @@
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QPushButton" name="addonsButton">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="toolTip">
+          <string>Opens the Addon Manager to download macros created by the community</string>
+         </property>
+         <property name="text">
+          <string>Download</string>
+         </property>
+        </widget>
+       </item>
        <item>
         <spacer>
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Expanding</enum>
+         </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
@@ -299,15 +305,9 @@
         </spacer>
        </item>
        <item>
-        <widget class="QPushButton" name="addonsButton">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="toolTip">
-          <string>Opens the Addon Manager to download macros created by the community</string>
-         </property>
+        <widget class="QPushButton" name="closeButton">
          <property name="text">
-          <string>Download</string>
+          <string>Close</string>
          </property>
         </widget>
        </item>
@@ -315,12 +315,12 @@
      </item>
     </layout>
    </item>
-   <item row="1" column="0">
+   <item>
     <widget class="QGroupBox" name="DestinationGroup">
      <property name="title">
       <string>User Macros Location</string>
      </property>
-     <layout class="QGridLayout">
+     <layout class="QHBoxLayout">
       <property name="leftMargin">
        <number>9</number>
       </property>
@@ -336,7 +336,7 @@
       <property name="spacing">
        <number>6</number>
       </property>
-      <item row="0" column="0">
+      <item>
        <widget class="Gui::FileChooser" name="fileChooser">
         <property name="focusPolicy">
          <enum>Qt::StrongFocus</enum>
@@ -346,7 +346,7 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
+      <item>
        <widget class="QPushButton" name="folderButton">
         <property name="enabled">
          <bool>true</bool>
@@ -373,16 +373,18 @@
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>LineEditMacroName</tabstop>
+  <tabstop>LineEditFind</tabstop>
+  <tabstop>LineEditFindInFiles</tabstop>
+  <tabstop>tabMacroWidget</tabstop>
   <tabstop>executeButton</tabstop>
-  <tabstop>closeButton</tabstop>
   <tabstop>createButton</tabstop>
-  <tabstop>deleteButton</tabstop>
   <tabstop>editButton</tabstop>
   <tabstop>renameButton</tabstop>
   <tabstop>duplicateButton</tabstop>
+  <tabstop>deleteButton</tabstop>
   <tabstop>toolbarButton</tabstop>
   <tabstop>addonsButton</tabstop>
+  <tabstop>closeButton</tabstop>
   <tabstop>fileChooser</tabstop>
   <tabstop>folderButton</tabstop>
  </tabstops>