diff --git a/novelwriter/gui/sidebar.py b/novelwriter/gui/sidebar.py
index 5aceb0d5..b03302ac 100644
--- a/novelwriter/gui/sidebar.py
+++ b/novelwriter/gui/sidebar.py
@@ -142,14 +142,14 @@ class GuiSideBar(QWidget):
         self.tbTheme.setStyleSheet(buttonStyle)
         self.tbSettings.setStyleSheet(buttonStyle)
 
-        self.tbProject.setThemeIcon("sb_project", "default")
-        self.tbNovel.setThemeIcon("sb_novel", "default")
-        self.tbSearch.setThemeIcon("sb_search", "default")
-        self.tbOutline.setThemeIcon("sb_outline", "default")
-        self.tbBuild.setThemeIcon("sb_build", "default")
-        self.tbDetails.setThemeIcon("sb_details", "default")
-        self.tbStats.setThemeIcon("sb_stats", "default")
-        self.tbSettings.setThemeIcon("settings", "default")
+        self.tbProject.setThemeIcon("sb_project", "sidebar")
+        self.tbNovel.setThemeIcon("sb_novel", "sidebar")
+        self.tbSearch.setThemeIcon("sb_search", "sidebar")
+        self.tbOutline.setThemeIcon("sb_outline", "sidebar")
+        self.tbBuild.setThemeIcon("sb_build", "sidebar")
+        self.tbDetails.setThemeIcon("sb_details", "sidebar")
+        self.tbStats.setThemeIcon("sb_stats", "sidebar")
+        self.tbSettings.setThemeIcon("settings", "sidebar")
 
         self._setThemeModeIcon()
 
@@ -176,7 +176,7 @@ class GuiSideBar(QWidget):
 
     def _setThemeModeIcon(self) -> None:
         """Set the theme button icon."""
-        self.tbTheme.setThemeIcon(nwLabels.THEME_MODE_ICON[CONFIG.themeMode], "default")
+        self.tbTheme.setThemeIcon(nwLabels.THEME_MODE_ICON[CONFIG.themeMode], "sidebar")
         self.tbTheme.setToolTip(trConst(nwLabels.THEME_MODE_LABEL[CONFIG.themeMode]))
 
 
diff --git a/novelwriter/gui/theme.py b/novelwriter/gui/theme.py
index 8f92304d..fb0935ab 100644
--- a/novelwriter/gui/theme.py
+++ b/novelwriter/gui/theme.py
@@ -361,6 +361,7 @@ class GuiTheme:
         sec = "Icon"
         if parser.has_section(sec):
             self._setBaseColor("tool",      self._readColor(parser, sec, "tool"))
+            self._setBaseColor("sidebar",   self._readColor(parser, sec, "sidebar"))
             self._setBaseColor("accept",    self._readColor(parser, sec, "accept"))
             self._setBaseColor("reject",    self._readColor(parser, sec, "reject"))
             self._setBaseColor("action",    self._readColor(parser, sec, "action"))
@@ -372,8 +373,8 @@ class GuiTheme:
             self._setBaseColor("add",       self._readColor(parser, sec, "add"))
             self._setBaseColor("change",    self._readColor(parser, sec, "change"))
             self._setBaseColor("remove",    self._readColor(parser, sec, "remove"))
-            self._setBaseColor("scformat",  self._readColor(parser, sec, "scformat"))
-            self._setBaseColor("mdformat",  self._readColor(parser, sec, "mdformat"))
+            self._setBaseColor("shortcode", self._readColor(parser, sec, "shortcode"))
+            self._setBaseColor("markdown",  self._readColor(parser, sec, "markdown"))
             self._setBaseColor("systemio",  self._readColor(parser, sec, "systemio"))
             self._setBaseColor("info",      self._readColor(parser, sec, "info"))
             self._setBaseColor("warning",   self._readColor(parser, sec, "warning"))