diff --git a/desktop/onionshare/main_window.py b/desktop/onionshare/main_window.py
index 986f8720..09dd53fa 100644
--- a/desktop/onionshare/main_window.py
+++ b/desktop/onionshare/main_window.py
@@ -81,7 +81,7 @@ class MainWindow(QtWidgets.QMainWindow):
 
         # Server status indicator icons
         self.status_bar.server_status_image_stopped = QtGui.QImage(
-            GuiCommon.get_resource_path("images/server_stopped.png")
+            GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_server_stopped.png")
         )
         self.status_bar.server_status_image_working = QtGui.QImage(
             GuiCommon.get_resource_path("images/server_working.png")
diff --git a/desktop/onionshare/resources/images/close_tab.png b/desktop/onionshare/resources/images/close_tab.png
deleted file mode 100644
index a7984a6d..00000000
Binary files a/desktop/onionshare/resources/images/close_tab.png and /dev/null differ
diff --git a/desktop/onionshare/resources/images/dark_history_completed_none.png b/desktop/onionshare/resources/images/dark_history_completed_none.png
new file mode 100644
index 00000000..4f23952a
Binary files /dev/null and b/desktop/onionshare/resources/images/dark_history_completed_none.png differ
diff --git a/desktop/onionshare/resources/images/dark_history_icon_toggle.png b/desktop/onionshare/resources/images/dark_history_icon_toggle.png
new file mode 100644
index 00000000..07d749ab
Binary files /dev/null and b/desktop/onionshare/resources/images/dark_history_icon_toggle.png differ
diff --git a/desktop/onionshare/resources/images/dark_history_icon_toggle_selected.png b/desktop/onionshare/resources/images/dark_history_icon_toggle_selected.png
new file mode 100644
index 00000000..99359210
Binary files /dev/null and b/desktop/onionshare/resources/images/dark_history_icon_toggle_selected.png differ
diff --git a/desktop/onionshare/resources/images/dark_history_in_progress_none.png b/desktop/onionshare/resources/images/dark_history_in_progress_none.png
new file mode 100644
index 00000000..a795fb2f
Binary files /dev/null and b/desktop/onionshare/resources/images/dark_history_in_progress_none.png differ
diff --git a/desktop/onionshare/resources/images/dark_history_requests_none.png b/desktop/onionshare/resources/images/dark_history_requests_none.png
new file mode 100644
index 00000000..ae859041
Binary files /dev/null and b/desktop/onionshare/resources/images/dark_history_requests_none.png differ
diff --git a/desktop/onionshare/resources/images/dark_server_stopped.png b/desktop/onionshare/resources/images/dark_server_stopped.png
new file mode 100644
index 00000000..4d2b91cc
Binary files /dev/null and b/desktop/onionshare/resources/images/dark_server_stopped.png differ
diff --git a/desktop/onionshare/resources/images/history_completed.png b/desktop/onionshare/resources/images/history_completed.png
index e68fe5a2..a84593d7 100644
Binary files a/desktop/onionshare/resources/images/history_completed.png and b/desktop/onionshare/resources/images/history_completed.png differ
diff --git a/desktop/onionshare/resources/images/history_completed_none.png b/desktop/onionshare/resources/images/history_completed_none.png
deleted file mode 100644
index 8dbd6939..00000000
Binary files a/desktop/onionshare/resources/images/history_completed_none.png and /dev/null differ
diff --git a/desktop/onionshare/resources/images/history_in_progress.png b/desktop/onionshare/resources/images/history_in_progress.png
index 19694659..b0cdac9e 100644
Binary files a/desktop/onionshare/resources/images/history_in_progress.png and b/desktop/onionshare/resources/images/history_in_progress.png differ
diff --git a/desktop/onionshare/resources/images/history_in_progress_none.png b/desktop/onionshare/resources/images/history_in_progress_none.png
deleted file mode 100644
index 2d61dba4..00000000
Binary files a/desktop/onionshare/resources/images/history_in_progress_none.png and /dev/null differ
diff --git a/desktop/onionshare/resources/images/history_requests.png b/desktop/onionshare/resources/images/history_requests.png
index 4965744d..18027c6e 100644
Binary files a/desktop/onionshare/resources/images/history_requests.png and b/desktop/onionshare/resources/images/history_requests.png differ
diff --git a/desktop/onionshare/resources/images/history_requests_none.png b/desktop/onionshare/resources/images/history_requests_none.png
deleted file mode 100644
index 93a71ef3..00000000
Binary files a/desktop/onionshare/resources/images/history_requests_none.png and /dev/null differ
diff --git a/desktop/onionshare/resources/images/light_history_completed_none.png b/desktop/onionshare/resources/images/light_history_completed_none.png
new file mode 100644
index 00000000..56532671
Binary files /dev/null and b/desktop/onionshare/resources/images/light_history_completed_none.png differ
diff --git a/desktop/onionshare/resources/images/light_history_icon_toggle.png b/desktop/onionshare/resources/images/light_history_icon_toggle.png
new file mode 100644
index 00000000..392cef0b
Binary files /dev/null and b/desktop/onionshare/resources/images/light_history_icon_toggle.png differ
diff --git a/desktop/onionshare/resources/images/light_history_icon_toggle_selected.png b/desktop/onionshare/resources/images/light_history_icon_toggle_selected.png
new file mode 100644
index 00000000..b2dc4d52
Binary files /dev/null and b/desktop/onionshare/resources/images/light_history_icon_toggle_selected.png differ
diff --git a/desktop/onionshare/resources/images/light_history_in_progress_none.png b/desktop/onionshare/resources/images/light_history_in_progress_none.png
new file mode 100644
index 00000000..4cc338a0
Binary files /dev/null and b/desktop/onionshare/resources/images/light_history_in_progress_none.png differ
diff --git a/desktop/onionshare/resources/images/light_history_requests_none.png b/desktop/onionshare/resources/images/light_history_requests_none.png
new file mode 100644
index 00000000..3e45e5e9
Binary files /dev/null and b/desktop/onionshare/resources/images/light_history_requests_none.png differ
diff --git a/desktop/onionshare/resources/images/light_server_stopped.png b/desktop/onionshare/resources/images/light_server_stopped.png
new file mode 100644
index 00000000..f4123b47
Binary files /dev/null and b/desktop/onionshare/resources/images/light_server_stopped.png differ
diff --git a/desktop/onionshare/resources/images/open_folder.png b/desktop/onionshare/resources/images/open_folder.png
index 0a734c41..5b452956 100644
Binary files a/desktop/onionshare/resources/images/open_folder.png and b/desktop/onionshare/resources/images/open_folder.png differ
diff --git a/desktop/onionshare/resources/images/server_started.png b/desktop/onionshare/resources/images/server_started.png
index 9c0c3176..971da6d8 100644
Binary files a/desktop/onionshare/resources/images/server_started.png and b/desktop/onionshare/resources/images/server_started.png differ
diff --git a/desktop/onionshare/resources/images/server_stopped.png b/desktop/onionshare/resources/images/server_stopped.png
deleted file mode 100644
index 5c5b2ec0..00000000
Binary files a/desktop/onionshare/resources/images/server_stopped.png and /dev/null differ
diff --git a/desktop/onionshare/resources/images/server_working.png b/desktop/onionshare/resources/images/server_working.png
index e5c8b318..d45ff296 100644
Binary files a/desktop/onionshare/resources/images/server_working.png and b/desktop/onionshare/resources/images/server_working.png differ
diff --git a/desktop/onionshare/resources/locale/en.json b/desktop/onionshare/resources/locale/en.json
index d279d206..f8bead69 100644
--- a/desktop/onionshare/resources/locale/en.json
+++ b/desktop/onionshare/resources/locale/en.json
@@ -131,15 +131,15 @@
     "gui_url_instructions": "First, send the OnionShare address below:",
     "gui_url_instructions_public_mode": "Send the OnionShare address below:",
     "gui_client_auth_instructions": "Next, send the private key to allow access to your OnionShare service:",
-    "gui_status_indicator_share_stopped": "Ready to share",
+    "gui_status_indicator_share_stopped": "Stopped",
     "gui_status_indicator_share_working": "Starting…",
     "gui_status_indicator_share_scheduled": "Scheduled…",
     "gui_status_indicator_share_started": "Sharing",
-    "gui_status_indicator_receive_stopped": "Ready to receive",
+    "gui_status_indicator_receive_stopped": "Stopped",
     "gui_status_indicator_receive_working": "Starting…",
     "gui_status_indicator_receive_scheduled": "Scheduled…",
     "gui_status_indicator_receive_started": "Receiving",
-    "gui_status_indicator_chat_stopped": "Ready to chat",
+    "gui_status_indicator_chat_stopped": "Stopped",
     "gui_status_indicator_chat_working": "Starting…",
     "gui_status_indicator_chat_scheduled": "Scheduled…",
     "gui_status_indicator_chat_started": "Chatting",
diff --git a/desktop/onionshare/tab/mode/history.py b/desktop/onionshare/tab/mode/history.py
index ad8af099..5b2da776 100644
--- a/desktop/onionshare/tab/mode/history.py
+++ b/desktop/onionshare/tab/mode/history.py
@@ -788,10 +788,10 @@ class History(QtWidgets.QWidget):
         Update the 'completed' widget.
         """
         if self.completed_count == 0:
-            image = GuiCommon.get_resource_path("images/history_completed_none.png")
+            image = GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_history_completed_none.png")
         else:
             image = GuiCommon.get_resource_path("images/history_completed.png")
-        self.completed_label.setText(f'<img src="{image}" /> {self.completed_count}')
+        self.completed_label.setText(f'<img src="{image}" height="10" /> {self.completed_count}')
         self.completed_label.setToolTip(
             strings._("history_completed_tooltip").format(self.completed_count)
         )
@@ -801,12 +801,12 @@ class History(QtWidgets.QWidget):
         Update the 'in progress' widget.
         """
         if self.in_progress_count == 0:
-            image = GuiCommon.get_resource_path("images/history_in_progress_none.png")
+            image = GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_history_in_progress_none.png")
         else:
             image = GuiCommon.get_resource_path("images/history_in_progress.png")
 
         self.in_progress_label.setText(
-            f'<img src="{image}" /> {self.in_progress_count}'
+            f'<img src="{image}" height="10" /> {self.in_progress_count}'
         )
         self.in_progress_label.setToolTip(
             strings._("history_in_progress_tooltip").format(self.in_progress_count)
@@ -817,11 +817,11 @@ class History(QtWidgets.QWidget):
         Update the 'web requests' widget.
         """
         if self.requests_count == 0:
-            image = GuiCommon.get_resource_path("images/history_requests_none.png")
+            image = GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_history_requests_none.png")
         else:
             image = GuiCommon.get_resource_path("images/history_requests.png")
 
-        self.requests_label.setText(f'<img src="{image}" /> {self.requests_count}')
+        self.requests_label.setText(f'<img src="{image}" height="10" /> {self.requests_count}')
         self.requests_label.setToolTip(
             strings._("history_requests_tooltip").format(self.requests_count)
         )
diff --git a/desktop/onionshare/tab/mode/receive_mode/__init__.py b/desktop/onionshare/tab/mode/receive_mode/__init__.py
index bfa85459..f44b022e 100644
--- a/desktop/onionshare/tab/mode/receive_mode/__init__.py
+++ b/desktop/onionshare/tab/mode/receive_mode/__init__.py
@@ -160,9 +160,9 @@ class ReceiveMode(Mode):
             self.common,
             self,
             self.history,
-            QtGui.QIcon(GuiCommon.get_resource_path("images/receive_icon_toggle.png")),
+            QtGui.QIcon(GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_history_icon_toggle.png")),
             QtGui.QIcon(
-                GuiCommon.get_resource_path("images/receive_icon_toggle_selected.png")
+                GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_history_icon_toggle_selected.png")
             ),
         )
 
diff --git a/desktop/onionshare/tab/mode/share_mode/__init__.py b/desktop/onionshare/tab/mode/share_mode/__init__.py
index daa35a4d..c190fbe7 100644
--- a/desktop/onionshare/tab/mode/share_mode/__init__.py
+++ b/desktop/onionshare/tab/mode/share_mode/__init__.py
@@ -135,9 +135,9 @@ class ShareMode(Mode):
             self.common,
             self,
             self.history,
-            QtGui.QIcon(GuiCommon.get_resource_path("images/share_icon_toggle.png")),
+            QtGui.QIcon(GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_history_icon_toggle.png")),
             QtGui.QIcon(
-                GuiCommon.get_resource_path("images/share_icon_toggle_selected.png")
+                GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_history_icon_toggle_selected.png")
             ),
         )
 
diff --git a/desktop/onionshare/tab/mode/website_mode/__init__.py b/desktop/onionshare/tab/mode/website_mode/__init__.py
index 47614cae..d5e237f6 100644
--- a/desktop/onionshare/tab/mode/website_mode/__init__.py
+++ b/desktop/onionshare/tab/mode/website_mode/__init__.py
@@ -157,9 +157,9 @@ class WebsiteMode(Mode):
             self.common,
             self,
             self.history,
-            QtGui.QIcon(GuiCommon.get_resource_path("images/share_icon_toggle.png")),
+            QtGui.QIcon(GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_history_icon_toggle.png")),
             QtGui.QIcon(
-                GuiCommon.get_resource_path("images/share_icon_toggle_selected.png")
+                GuiCommon.get_resource_path(f"images/{self.common.gui.color_mode}_history_icon_toggle_selected.png")
             ),
         )
 
diff --git a/desktop/onionshare/tab/tab.py b/desktop/onionshare/tab/tab.py
index ab6cc3e5..4645577a 100644
--- a/desktop/onionshare/tab/tab.py
+++ b/desktop/onionshare/tab/tab.py
@@ -480,23 +480,29 @@ class Tab(QtWidgets.QWidget):
                 )
 
     def set_server_status_indicator_stopped(self, label_text):
-        self.change_icon.emit(self.tab_id, "images/server_stopped.png")
+        self.change_icon.emit(self.tab_id, f"images/{self.common.gui.color_mode}_server_stopped.png")
+        image = self.status_bar.server_status_image_stopped
+        scaled_image = image.scaledToHeight(15, QtCore.Qt.SmoothTransformation)
         self.status_bar.server_status_image_label.setPixmap(
-            QtGui.QPixmap.fromImage(self.status_bar.server_status_image_stopped)
+            QtGui.QPixmap.fromImage(scaled_image)
         )
         self.status_bar.server_status_label.setText(label_text)
 
     def set_server_status_indicator_working(self, label_text):
         self.change_icon.emit(self.tab_id, "images/server_working.png")
+        image = self.status_bar.server_status_image_working
+        scaled_image = image.scaledToHeight(15, QtCore.Qt.SmoothTransformation)
         self.status_bar.server_status_image_label.setPixmap(
-            QtGui.QPixmap.fromImage(self.status_bar.server_status_image_working)
+            QtGui.QPixmap.fromImage(scaled_image)
         )
         self.status_bar.server_status_label.setText(label_text)
 
     def set_server_status_indicator_started(self, label_text):
         self.change_icon.emit(self.tab_id, "images/server_started.png")
+        image = self.status_bar.server_status_image_started
+        scaled_image = image.scaledToHeight(15, QtCore.Qt.SmoothTransformation)
         self.status_bar.server_status_image_label.setPixmap(
-            QtGui.QPixmap.fromImage(self.status_bar.server_status_image_started)
+            QtGui.QPixmap.fromImage(scaled_image)
         )
         self.status_bar.server_status_label.setText(label_text)