diff --git a/src/lay/lay/MacroEditorDialog.ui b/src/lay/lay/MacroEditorDialog.ui
index fa02c8421..5058a5440 100644
--- a/src/lay/lay/MacroEditorDialog.ui
+++ b/src/lay/lay/MacroEditorDialog.ui
@@ -463,6 +463,10 @@
              <property name="text">
               <string>...</string>
              </property>
+             <property name="icon">
+              <iconset resource="../../icons/icons.qrc">
+               <normaloff>:/breakpoint_16px.png</normaloff>:/breakpoint_16px.png</iconset>
+             </property>
              <property name="shortcut">
               <string>F9</string>
              </property>
@@ -614,13 +618,20 @@
              <property name="sizeHint" stdset="0">
               <size>
                <width>40</width>
-               <height>20</height>
+               <height>16</height>
               </size>
              </property>
             </spacer>
            </item>
            <item>
-            <widget class="lay::DecoratedLineEdit" name="searchEditBox"/>
+            <widget class="lay::DecoratedLineEdit" name="searchEditBox">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Ignored">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+            </widget>
            </item>
            <item>
             <widget class="QToolButton" name="findNextButton">
@@ -721,7 +732,14 @@
                <number>0</number>
               </property>
               <item>
-               <widget class="lay::DecoratedLineEdit" name="replaceText"/>
+               <widget class="lay::DecoratedLineEdit" name="replaceText">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Expanding" vsizetype="Ignored">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+               </widget>
               </item>
               <item>
                <widget class="QToolButton" name="replaceNextButton">
diff --git a/src/lay/lay/layMacroEditorPage.cc b/src/lay/lay/layMacroEditorPage.cc
index bcb8c302f..b0980c315 100644
--- a/src/lay/lay/layMacroEditorPage.cc
+++ b/src/lay/lay/layMacroEditorPage.cc
@@ -549,13 +549,16 @@ MacroEditorPage::MacroEditorPage (QWidget * /*parent*/, MacroEditorHighlighters
   mp_layout = new QVBoxLayout (this);
   mp_layout->setContentsMargins (0, 0, 0, 0);
 
+  QVBoxLayout *vlayout = new QVBoxLayout (this);
+  vlayout->setContentsMargins (4, 4, 4, 4);
+  mp_layout->addLayout (vlayout);
+
   mp_readonly_label = new QLabel (this);
   mp_readonly_label->setText (QObject::tr ("Macro is read-only and cannot be edited"));
   mp_readonly_label->hide ();
-  mp_layout->addWidget (mp_readonly_label);
+  vlayout->addWidget (mp_readonly_label);
 
   QHBoxLayout *hlayout = new QHBoxLayout ();
-  hlayout->setContentsMargins (4, 4, 4, 4);
   mp_layout->addLayout (hlayout);
 
   mp_exec_model = new MacroEditorExecutionModel (this);