diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index 1eed64436..8b175e95c 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -282,6 +282,9 @@ void MainWindow::connectSlots()
   connect(&m_ClientConnection, &ClientConnection::messageShowing, this, &MainWindow::showAndActivate);
 
   connect(ui->btnToggleCore, &QPushButton::clicked, m_actionStartCore, &QAction::trigger, Qt::UniqueConnection);
+  connect(ui->btnApplySettings, &QPushButton::clicked, this, &MainWindow::resetCore);
+  connect(ui->btnConnect, &QPushButton::clicked, this, &MainWindow::resetCore);
+  connect(ui->btnConnectToClient, &QPushButton::clicked, this, &MainWindow::resetCore);
 }
 
 void MainWindow::onAppAboutToQuit()
@@ -458,12 +461,12 @@ void MainWindow::on_m_pButtonConfigureServer_clicked()
 
 void MainWindow::on_m_pLineEditHostname_returnPressed()
 {
-  ui->m_pButtonConnect->click();
+  ui->btnConnect->click();
 }
 
 void MainWindow::on_m_pLineEditClientIp_returnPressed()
 {
-  ui->m_pButtonConnectToClient->click();
+  ui->btnConnectToClient->click();
 }
 
 void MainWindow::on_m_pLineEditHostname_textChanged(const QString &text)
@@ -476,7 +479,7 @@ void MainWindow::on_m_pLineEditClientIp_textChanged(const QString &text)
   m_CoreProcess.setAddress(text);
 }
 
-void MainWindow::on_m_pButtonApply_clicked()
+void MainWindow::resetCore()
 {
   m_ClientConnection.setShowMessage();
   m_CoreProcess.restart();
@@ -506,16 +509,6 @@ void MainWindow::on_m_pRadioGroupClient_clicked(bool)
   m_ConfigScopes.save();
 }
 
-void MainWindow::on_m_pButtonConnect_clicked()
-{
-  on_m_pButtonApply_clicked();
-}
-
-void MainWindow::on_m_pButtonConnectToClient_clicked()
-{
-  on_m_pButtonApply_clicked();
-}
-
 void MainWindow::onWindowSaveTimerTimeout()
 {
   saveWindow();
@@ -896,7 +889,7 @@ void MainWindow::onCoreProcessStateChanged(CoreProcessState state)
     connect(ui->btnToggleCore, &QPushButton::clicked, m_actionStopCore, &QAction::trigger, Qt::UniqueConnection);
 
     ui->btnToggleCore->setText(QString("&Stop"));
-    ui->m_pButtonApply->setEnabled(true);
+    ui->btnApplySettings->setEnabled(true);
 
     m_actionStartCore->setEnabled(false);
     m_actionStopCore->setEnabled(true);
@@ -906,7 +899,7 @@ void MainWindow::onCoreProcessStateChanged(CoreProcessState state)
     connect(ui->btnToggleCore, &QPushButton::clicked, m_actionStartCore, &QAction::trigger, Qt::UniqueConnection);
 
     ui->btnToggleCore->setText(QString("&Start"));
-    ui->m_pButtonApply->setEnabled(false);
+    ui->btnApplySettings->setEnabled(false);
 
     m_actionStartCore->setEnabled(true);
     m_actionStopCore->setEnabled(false);
diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h
index 14b1b6765..5a50b3d26 100644
--- a/src/gui/src/MainWindow.h
+++ b/src/gui/src/MainWindow.h
@@ -129,15 +129,12 @@ private slots:
   bool saveConfig();
   void testFatalError() const;
   void testCriticalError() const;
-
+  void resetCore();
   //
   // Auto-connect slots
   //
-  void on_m_pButtonApply_clicked();
   void on_m_pLabelComputerName_linkActivated(const QString &link);
   void on_m_pLabelFingerprint_linkActivated(const QString &link);
-  void on_m_pButtonConnect_clicked();
-  void on_m_pButtonConnectToClient_clicked();
   void on_m_pRadioGroupServer_clicked(bool);
   void on_m_pRadioGroupClient_clicked(bool);
   void on_m_pButtonConfigureServer_clicked();
diff --git a/src/gui/src/MainWindow.ui b/src/gui/src/MainWindow.ui
index 8aa2ecaf1..309917657 100644
--- a/src/gui/src/MainWindow.ui
+++ b/src/gui/src/MainWindow.ui
@@ -209,7 +209,7 @@
                    <widget class="QLineEdit" name="m_pLineEditClientIp"/>
                   </item>
                   <item>
-                   <widget class="QPushButton" name="m_pButtonConnectToClient">
+                   <widget class="QPushButton" name="btnConnectToClient">
                     <property name="text">
                      <string>Connect</string>
                     </property>
@@ -389,7 +389,7 @@
                 </widget>
                </item>
                <item>
-                <widget class="QPushButton" name="m_pButtonConnect">
+                <widget class="QPushButton" name="btnConnect">
                  <property name="text">
                   <string>Connect</string>
                  </property>
@@ -576,7 +576,7 @@
        </spacer>
       </item>
       <item>
-       <widget class="QPushButton" name="m_pButtonApply">
+       <widget class="QPushButton" name="btnApplySettings">
         <property name="enabled">
          <bool>false</bool>
         </property>
@@ -616,12 +616,12 @@
   <tabstop>m_pRadioGroupServer</tabstop>
   <tabstop>m_pRadioGroupClient</tabstop>
   <tabstop>m_pLineEditClientIp</tabstop>
-  <tabstop>m_pButtonConnectToClient</tabstop>
+  <tabstop>btnConnectToClient</tabstop>
   <tabstop>m_pButtonConfigureServer</tabstop>
   <tabstop>m_pLineEditHostname</tabstop>
-  <tabstop>m_pButtonConnect</tabstop>
+  <tabstop>btnConnect</tabstop>
   <tabstop>m_pLogOutput</tabstop>
-  <tabstop>m_pButtonApply</tabstop>
+  <tabstop>btnApplySettings</tabstop>
   <tabstop>btnToggleCore</tabstop>
  </tabstops>
 </ui>