diff --git a/src/apps/deskflow-gui/MainWindow.cpp b/src/apps/deskflow-gui/MainWindow.cpp
index e72029cd3..24384e745 100644
--- a/src/apps/deskflow-gui/MainWindow.cpp
+++ b/src/apps/deskflow-gui/MainWindow.cpp
@@ -222,7 +222,7 @@ void MainWindow::setupControls()
   }
 
   // Setup the log toggle, set its initial state to closed
-  ui->btnToggleLog->setStyleSheet(QStringLiteral("background:rgba(0,0,0,0);"));
+  ui->btnToggleLog->setStyleSheet(kStyleFlatButton);
   if (m_appConfig.logExpanded()) {
     ui->btnToggleLog->setArrowType(Qt::DownArrow);
     ui->textLog->setVisible(true);
@@ -247,6 +247,7 @@ void MainWindow::setupControls()
 #endif
 
   const auto trayItemSize = QSize(24, 24);
+  m_btnFingerprint->setStyleSheet(kStyleFlatButtonHoverable);
   m_btnFingerprint->setIcon(QIcon::fromTheme(QStringLiteral("fingerprint")));
   m_btnFingerprint->setFixedSize(trayItemSize);
   m_btnFingerprint->setIconSize(trayItemSize);
@@ -262,12 +263,13 @@ void MainWindow::setupControls()
   ui->statusBar->insertPermanentWidget(2, m_lblStatus, 1);
 
   m_btnUpdate->setVisible(false);
+  m_btnUpdate->setStyleSheet(kStyleFlatButtonHoverable);
+  m_btnUpdate->setFlat(true);
   m_btnUpdate->setText(tr("Update available"));
   m_btnUpdate->setLayoutDirection(Qt::RightToLeft);
   m_btnUpdate->setIcon(QIcon::fromTheme(QStringLiteral("software-updates-release")));
   m_btnUpdate->setFixedHeight(24);
   m_btnUpdate->setIconSize(trayItemSize);
-  m_btnUpdate->setFlat(true);
   ui->statusBar->insertPermanentWidget(3, m_btnUpdate);
 }
 
diff --git a/src/lib/gui/styles.h b/src/lib/gui/styles.h
index cbcf2ae5a..efab9277b 100644
--- a/src/lib/gui/styles.h
+++ b/src/lib/gui/styles.h
@@ -31,4 +31,11 @@ const auto kStyleErrorInactiveLabel = //
     QStringLiteral("padding: 3px 5px; border-radius: 3px;"
                    "background-color: none");
 
+const auto kStyleFlatButton = QStringLiteral("QAbstractButton{background-color: none; border: none;}");
+
+const auto kStyleFlatButtonHoverable = QStringLiteral("%1\n"
+                                                      "QAbstractButton:hover{border: 1px solid palette(highlight);"
+                                                      " border-radius: 6px}")
+                                           .arg(kStyleFlatButton);
+
 } // namespace deskflow::gui