diff --git a/modules/gui/qt/dialogs/extended/extended_panels.cpp b/modules/gui/qt/dialogs/extended/extended_panels.cpp
index c12854b8b1..2893997f07 100644
--- a/modules/gui/qt/dialogs/extended/extended_panels.cpp
+++ b/modules/gui/qt/dialogs/extended/extended_panels.cpp
@@ -1457,6 +1457,11 @@ SyncControls::SyncControls( qt_intf_t *_p_intf, QWidget *_parent )
 
     updateButton = new QToolButton;
     updateButton->setAutoRaise( true );
+    updateButton->setText("");
+    updateButton->setToolTip(qtr( "Eject the disc" ));
+    updateButton->setIcon( QIcon( ":/menu/update.svg") );
+    BUTTONACT( updateButton, &SyncControls::update );
+
     mainLayout->addWidget( updateButton, 0, 4, 1, 1 );
 
     /* Various Connects */
@@ -1484,9 +1489,6 @@ SyncControls::SyncControls( qt_intf_t *_p_intf, QWidget *_parent )
     connect( THEMIM, &PlayerController::subtitleFPSChanged, subSpeedSpin, &QDoubleSpinBox::setValue );
     connect( &m_SubsDelayCfgFactor, &QVLCFloat::valueChanged, subDurationSpin, &QDoubleSpinBox::setValue);
 
-    BUTTON_SET_ACT( updateButton, "", qtr( "Eject the disc" ), &SyncControls::update );
-    updateButton->setIcon( QIcon( ":/menu/update.svg") );
-
     initSubsDuration();
 
     /* Set it */
diff --git a/modules/gui/qt/dialogs/open/open_disk.ui b/modules/gui/qt/dialogs/open/open_disk.ui
index 7b4c5d2f0f..f0ab8d35cc 100644
--- a/modules/gui/qt/dialogs/open/open_disk.ui
+++ b/modules/gui/qt/dialogs/open/open_disk.ui
@@ -156,6 +156,13 @@
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
+          <property name="toolTip">
+           <string>Eject the disc</string>
+          </property>
+          <property name="icon">
+           <iconset resource="../../vlc.qrc">
+            <normaloff>:/menu/eject.svg</normaloff>:/menu/eject.svg</iconset>
+          </property>
          </widget>
         </item>
         <item>
@@ -393,6 +400,8 @@
   <tabstop>audioSpin</tabstop>
   <tabstop>subtitlesSpin</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="../../vlc.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/modules/gui/qt/dialogs/open/open_panels.cpp b/modules/gui/qt/dialogs/open/open_panels.cpp
index 2ef633448c..00746a0a49 100644
--- a/modules/gui/qt/dialogs/open/open_panels.cpp
+++ b/modules/gui/qt/dialogs/open/open_panels.cpp
@@ -365,8 +365,7 @@ DiscOpenPanel::DiscOpenPanel( QWidget *_parent, qt_intf_t *_p_intf ) :
     BUTTONACT( ui.audioCDRadioButton, &DiscOpenPanel::updateButtons );
     BUTTONACT( ui.dvdsimple,          &DiscOpenPanel::updateButtons );
     BUTTONACT( ui.browseDiscButton,   &DiscOpenPanel::browseDevice );
-    BUTTON_SET_ACT( ui.ejectButton, "", qtr( "Eject the disc"), &DiscOpenPanel::eject );
-    ui.ejectButton->setIcon( QIcon( ":/menu/eject.svg") );
+    BUTTONACT( ui.ejectButton,  &DiscOpenPanel::eject );
 
     connect( ui.deviceCombo, &QComboBox::editTextChanged, this, &DiscOpenPanel::updateMRL );
     connect( ui.deviceCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
diff --git a/modules/gui/qt/qt.hpp b/modules/gui/qt/qt.hpp
index aeb539eba6..e07e48ba22 100644
--- a/modules/gui/qt/qt.hpp
+++ b/modules/gui/qt/qt.hpp
@@ -144,11 +144,6 @@ struct vlc_player_locker {
 
 #define BUTTONACT( b, a ) connect( b, &QAbstractButton::clicked, this, a )
 
-#define BUTTON_SET_ACT( button, text, tooltip, thisslot ) \
-    button->setText( text );       \
-    button->setToolTip( tooltip ); \
-    BUTTONACT( button, thisslot );
-
 #define getSettings() p_intf->mainSettings
 
 static inline QString QVLCUserDir( vlc_userdir_t type )