diff --git a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsView.fxml b/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsView.fxml
index aebd95beb1..896438a1c5 100644
--- a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsView.fxml
+++ b/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsView.fxml
@@ -38,5 +38,5 @@
             <TableColumn fx:id="revertTxColumn" sortable="false" minWidth="110" maxWidth="110" visible="false"/>
         </columns>
     </TableView>
-    <Button fx:id="exportButton"/>
+    <AutoTooltipButtonfx:id="exportButton"/>
 </VBox>
diff --git a/desktop/src/main/java/bisq/desktop/main/funds/withdrawal/WithdrawalView.fxml b/desktop/src/main/java/bisq/desktop/main/funds/withdrawal/WithdrawalView.fxml
index 3a6530c4c3..b2545e3a0d 100644
--- a/desktop/src/main/java/bisq/desktop/main/funds/withdrawal/WithdrawalView.fxml
+++ b/desktop/src/main/java/bisq/desktop/main/funds/withdrawal/WithdrawalView.fxml
@@ -72,7 +72,7 @@
         <AutoTooltipLabel fx:id="toLabel" GridPane.rowIndex="3"/>
         <TextField fx:id="withdrawToTextField" GridPane.rowIndex="3" GridPane.columnIndex="1" GridPane.columnSpan="3"/>
 
-        <Button fx:id="withdrawButton" defaultButton="true" onAction="#onWithdraw"
+        <AutoTooltipButtonfx:id="withdrawButton" defaultButton="true" onAction="#onWithdraw"
                 GridPane.rowIndex="4"
                 GridPane.columnIndex="1"/>
 
diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.fxml b/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.fxml
index a04f192aa3..8fb34a893e 100644
--- a/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.fxml
+++ b/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.fxml
@@ -41,5 +41,5 @@
             <TableColumn fx:id="avatarColumn" minWidth="40" maxWidth="40"/>
         </columns>
     </TableView>
-    <Button fx:id="exportButton"/>
+    <AutoTooltipButtonfx:id="exportButton"/>
 </VBox>
diff --git a/desktop/src/main/java/bisq/desktop/main/settings/network/NetworkSettingsView.fxml b/desktop/src/main/java/bisq/desktop/main/settings/network/NetworkSettingsView.fxml
index d56936efee..1cceb2aa28 100644
--- a/desktop/src/main/java/bisq/desktop/main/settings/network/NetworkSettingsView.fxml
+++ b/desktop/src/main/java/bisq/desktop/main/settings/network/NetworkSettingsView.fxml
@@ -17,13 +17,13 @@
   ~ along with Bisq. If not, see <http://www.gnu.org/licenses/>.
   -->
 
+<?import bisq.desktop.components.AutoTooltipButton?>
+<?import bisq.desktop.components.AutoTooltipCheckBox?>
 <?import bisq.desktop.components.AutoTooltipLabel?>
 <?import bisq.desktop.components.AutoTooltipRadioButton?>
 <?import bisq.desktop.components.InputTextField?>
 <?import bisq.desktop.components.TitledGroupBg?>
-<?import javafx.scene.control.Button?>
 <?import javafx.scene.control.cell.PropertyValueFactory?>
-<?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.TableColumn?>
 <?import javafx.scene.control.TableView?>
 <?import javafx.scene.control.TextArea?>
@@ -50,7 +50,7 @@
               GridPane.vgrow="SOMETIMES" editable="false" focusTraversable="false"/>
 
     <AutoTooltipLabel fx:id="useTorForBtcJLabel" GridPane.rowIndex="1"/>
-    <CheckBox fx:id="useTorForBtcJCheckBox" GridPane.rowIndex="1" GridPane.columnIndex="1"/>
+    <AutoTooltipCheckBox fx:id="useTorForBtcJCheckBox" GridPane.rowIndex="1" GridPane.columnIndex="1"/>
 
     <AutoTooltipLabel fx:id="bitcoinNodesLabel" GridPane.rowIndex="2"/>
     <HBox GridPane.rowIndex="2" GridPane.columnIndex="1" spacing="10">
@@ -63,7 +63,7 @@
     <InputTextField fx:id="btcNodesInputTextField" GridPane.rowIndex="3" GridPane.columnIndex="1"/>
 
     <AutoTooltipLabel fx:id="reSyncSPVChainLabel" GridPane.rowIndex="4"/>
-    <Button fx:id="reSyncSPVChainButton" GridPane.rowIndex="4" GridPane.columnIndex="1"/>
+    <AutoTooltipButton fx:id="reSyncSPVChainButton" GridPane.rowIndex="4" GridPane.columnIndex="1"/>
 
     <TitledGroupBg fx:id="p2pHeader" GridPane.rowIndex="5" GridPane.rowSpan="4">
         <padding>
@@ -132,7 +132,7 @@
     <TextField fx:id="totalTrafficTextField" GridPane.rowIndex="7" GridPane.columnIndex="1" editable="false"
                focusTraversable="false"/>
 
-    <Button fx:id="openTorSettingsButton" GridPane.rowIndex="8" GridPane.columnIndex="1"/>
+    <AutoTooltipButton fx:id="openTorSettingsButton" GridPane.rowIndex="8" GridPane.columnIndex="1"/>
 
     <columnConstraints>
         <ColumnConstraints hgrow="ALWAYS" halignment="RIGHT"/>