diff --git a/onionshare_gui/gui_common.py b/onionshare_gui/gui_common.py
index 4507d998..5008c03a 100644
--- a/onionshare_gui/gui_common.py
+++ b/onionshare_gui/gui_common.py
@@ -73,9 +73,7 @@ class GuiCommon:
                 }""",
             "settings_button": """
                 QPushButton {
-                    background-color: #601f61;
                     border: 0;
-                    border-left: 1px solid #69266b;
                     border-radius: 0;
                 }""",
             "server_status_indicator_label": """
diff --git a/onionshare_gui/main_window.py b/onionshare_gui/main_window.py
index b10333b5..6d8f034d 100644
--- a/onionshare_gui/main_window.py
+++ b/onionshare_gui/main_window.py
@@ -95,6 +95,18 @@ class MainWindow(QtWidgets.QMainWindow):
         )
         self.status_bar.addPermanentWidget(self.status_bar.server_status_indicator)
 
+        # Settings button
+        self.settings_button = QtWidgets.QPushButton()
+        self.settings_button.setDefault(False)
+        self.settings_button.setFixedWidth(40)
+        self.settings_button.setFixedHeight(50)
+        self.settings_button.setIcon(
+            QtGui.QIcon(self.common.get_resource_path("images/settings.png"))
+        )
+        self.settings_button.clicked.connect(self.open_settings)
+        self.settings_button.setStyleSheet(self.common.gui.css["settings_button"])
+        self.status_bar.addPermanentWidget(self.settings_button)
+
         # Tabs
         self.tabs = TabWidget(self.common, self.system_tray, self.status_bar)
 
diff --git a/onionshare_gui/tab/tab.py b/onionshare_gui/tab/tab.py
index b9416bc7..8cdf3afa 100644
--- a/onionshare_gui/tab/tab.py
+++ b/onionshare_gui/tab/tab.py
@@ -103,17 +103,6 @@ class Tab(QtWidgets.QWidget):
         self.new_tab.setLayout(new_tab_outer_layout)
         self.new_tab.show()
 
-        # Settings button, but this is gonna disappear
-        self.settings_button = QtWidgets.QPushButton()
-        self.settings_button.setDefault(False)
-        self.settings_button.setFixedWidth(40)
-        self.settings_button.setFixedHeight(50)
-        self.settings_button.setIcon(
-            QtGui.QIcon(self.common.get_resource_path("images/settings.png"))
-        )
-        # self.settings_button.clicked.connect(self.open_settings)
-        self.settings_button.setStyleSheet(self.common.gui.css["settings_button"])
-
         # Server status indicator icons
         self.status_bar.server_status_image_stopped = QtGui.QImage(
             self.common.get_resource_path("images/server_stopped.png")
diff --git a/share/images/settings.png b/share/images/settings.png
index ec35400a..b6f8fa55 100644
Binary files a/share/images/settings.png and b/share/images/settings.png differ