diff --git a/desktop/src/onionshare/gui_common.py b/desktop/src/onionshare/gui_common.py
index 1dffab26..a9539714 100644
--- a/desktop/src/onionshare/gui_common.py
+++ b/desktop/src/onionshare/gui_common.py
@@ -392,25 +392,15 @@ class GuiCommon:
                 QPushButton {
                     padding: 5px 10px;
                 }""",
-            # Settings dialog
+            # Settings dialogs
             "settings_version": """
                 QLabel {
                     color: #666666;
                 }""",
-            "settings_tor_status": """
-                QLabel {
-                    background-color: #ffffff;
-                    color: #000000;
-                    padding: 10px;
-                }""",
             "settings_whats_this": """
                 QLabel {
                     font-size: 12px;
                 }""",
-            "settings_connect_to_tor": """
-                QLabel {
-                    font-style: italic;
-                }""",
         }
 
     def get_tor_paths(self):
diff --git a/desktop/src/onionshare/tor_settings_dialog.py b/desktop/src/onionshare/tor_settings_dialog.py
index 60b006be..a1b02313 100644
--- a/desktop/src/onionshare/tor_settings_dialog.py
+++ b/desktop/src/onionshare/tor_settings_dialog.py
@@ -331,22 +331,16 @@ class TorSettingsDialog(QtWidgets.QDialog):
         )
         self.connection_type_bridges_radio_group.hide()
 
-        # Test tor settings button
-        self.connection_type_test_button = QtWidgets.QPushButton(
-            strings._("gui_settings_connection_type_test_button")
-        )
-        self.connection_type_test_button.clicked.connect(self.test_tor_clicked)
-        connection_type_test_button_layout = QtWidgets.QHBoxLayout()
-        connection_type_test_button_layout.addWidget(self.connection_type_test_button)
-        connection_type_test_button_layout.addStretch()
-
         # Connection type layout
         connection_type_layout = QtWidgets.QVBoxLayout()
         connection_type_layout.addWidget(self.tor_settings_group)
         connection_type_layout.addWidget(self.connection_type_bridges_radio_group)
-        connection_type_layout.addLayout(connection_type_test_button_layout)
 
         # Buttons
+        self.test_tor_button = QtWidgets.QPushButton(
+            strings._("gui_settings_connection_type_test_button")
+        )
+        self.test_tor_button.clicked.connect(self.test_tor_clicked)
         self.save_button = QtWidgets.QPushButton(strings._("gui_settings_button_save"))
         self.save_button.clicked.connect(self.save_clicked)
         self.cancel_button = QtWidgets.QPushButton(
@@ -354,6 +348,7 @@ class TorSettingsDialog(QtWidgets.QDialog):
         )
         self.cancel_button.clicked.connect(self.cancel_clicked)
         buttons_layout = QtWidgets.QHBoxLayout()
+        buttons_layout.addWidget(self.test_tor_button)
         buttons_layout.addStretch()
         buttons_layout.addWidget(self.save_button)
         buttons_layout.addWidget(self.cancel_button)