diff --git a/lib/redeyereduction/redeyereductiontool.h b/lib/redeyereduction/redeyereductiontool.h
--- a/lib/redeyereduction/redeyereductiontool.h
+++ b/lib/redeyereduction/redeyereductiontool.h
@@ -59,15 +59,16 @@
 
     void toolActivated() override;
 
+    void slotApplyClicked();
+
     QWidget* widget() const override;
 
 Q_SIGNALS:
     void done();
     void imageOperationRequested(AbstractImageOperation*);
 
 private Q_SLOTS:
     void setDiameter(int);
-    void slotApplyClicked();
 
 private:
     RedEyeReductionToolPrivate* const d;
diff --git a/lib/redeyereduction/redeyereductiontool.cpp b/lib/redeyereduction/redeyereductiontool.cpp
--- a/lib/redeyereduction/redeyereductiontool.cpp
+++ b/lib/redeyereduction/redeyereductiontool.cpp
@@ -46,17 +46,21 @@
     RedEyeReductionWidget()
     {
         setupUi(this);
+        QPushButton* okButton = mainDialogButtonBox->button(QDialogButtonBox::Ok);
+        okButton->setIcon(QIcon::fromTheme(QStringLiteral("redeyes")));
+        okButton->setText(i18n("Reduce Red Eye"));
     }
 
     void showNotSetPage()
     {
-        dialogButtonBox->button(QDialogButtonBox::Ok)->hide();
+        // Prevent Close button from turning blue upon accepting
+        helpTextLabel->setFocus();
+
         stackedWidget->setCurrentWidget(notSetPage);
     }
 
     void showMainPage()
     {
-        dialogButtonBox->button(QDialogButtonBox::Ok)->show();
         stackedWidget->setCurrentWidget(mainPage);
     }
 };
@@ -75,10 +79,12 @@
         mToolWidget->showNotSetPage();
         QObject::connect(mToolWidget->diameterSpinBox, SIGNAL(valueChanged(int)),
                          q, SLOT(setDiameter(int)));
-        QObject::connect(mToolWidget->dialogButtonBox, SIGNAL(accepted()),
-                         q, SLOT(slotApplyClicked()));
-        QObject::connect(mToolWidget->dialogButtonBox, SIGNAL(rejected()),
-                         q, SIGNAL(done()));
+        QObject::connect(mToolWidget->mainDialogButtonBox, &QDialogButtonBox::accepted,
+                         q, &RedEyeReductionTool::slotApplyClicked);
+        QObject::connect(mToolWidget->mainDialogButtonBox, &QDialogButtonBox::rejected,
+                         q, &RedEyeReductionTool::done);
+        QObject::connect(mToolWidget->helpDialogButtonBox, &QDialogButtonBox::rejected,
+                         q, &RedEyeReductionTool::done);
     }
 
     QRectF rectF() const
@@ -171,21 +177,23 @@
         return;
     }
     event->accept();
-    d->mToolWidget->dialogButtonBox->accepted();
+    d->mToolWidget->mainDialogButtonBox->accepted();
 }
 
 void RedEyeReductionTool::keyPressEvent(QKeyEvent* event)
 {
-    QDialogButtonBox *buttons = d->mToolWidget->findChild<QDialogButtonBox *>();
+    QDialogButtonBox *buttons = d->mToolWidget->mainDialogButtonBox;
     switch (event->key()) {
     case Qt::Key_Escape:
         event->accept();
         buttons->rejected();
         break;
     case Qt::Key_Return:
     case Qt::Key_Enter:
         event->accept();
-        buttons->accepted();
+        if (d->mStatus == Adjusting) {
+            buttons->accepted();
+        }
         break;
     default:
         break;
diff --git a/lib/redeyereduction/redeyereductionwidget.ui b/lib/redeyereduction/redeyereductionwidget.ui
--- a/lib/redeyereduction/redeyereductionwidget.ui
+++ b/lib/redeyereduction/redeyereductionwidget.ui
@@ -10,26 +10,57 @@
     <height>56</height>
    </rect>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
+  <layout class="QHBoxLayout" name="horizontalLayout_3">
    <item>
     <widget class="QStackedWidget" name="stackedWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="mainPage">
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+       <item>
+        <spacer name="horizontalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
        <item>
         <widget class="QLabel" name="label">
          <property name="text">
-          <string>Size</string>
+          <string>Size:</string>
          </property>
          <property name="buddy">
           <cstring>diameterSlider</cstring>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QSlider" name="diameterSlider">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>120</width>
+           <height>0</height>
+          </size>
+         </property>
          <property name="minimum">
           <number>2</number>
          </property>
@@ -51,31 +82,112 @@
          </property>
         </widget>
        </item>
+       <item>
+        <spacer name="horizontalSpacer_5">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>12</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QDialogButtonBox" name="mainDialogButtonBox">
+         <property name="standardButtons">
+          <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_4">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
-      <zorder>diameterSpinBox</zorder>
-      <zorder>label</zorder>
-      <zorder>diameterSlider</zorder>
      </widget>
      <widget class="QWidget" name="notSetPage">
-      <layout class="QHBoxLayout" name="horizontalLayout_3">
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
        <item>
-        <widget class="QLabel" name="label_2">
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QLabel" name="helpTextLabel">
          <property name="text">
           <string>Click on a red eye and choose a size, or double-click to correct instantly.</string>
          </property>
         </widget>
        </item>
+       <item>
+        <spacer name="horizontalSpacer_6">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>12</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QDialogButtonBox" name="helpDialogButtonBox">
+         <property name="standardButtons">
+          <set>QDialogButtonBox::Close</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
     </widget>
    </item>
-   <item>
-    <widget class="QDialogButtonBox" name="dialogButtonBox">
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>