diff --git a/core/palettes/Blanca.tid b/core/palettes/Blanca.tid
index 11b61983f..4983104e9 100644
--- a/core/palettes/Blanca.tid
+++ b/core/palettes/Blanca.tid
@@ -90,5 +90,14 @@ tiddler-link-background: <<colour background>>
 tiddler-link-foreground: <<colour primary>>
 tiddler-subtitle-foreground: #c0c0c0
 tiddler-title-foreground: #ff9900
+toolbar-new-button:
+toolbar-options-button:
+toolbar-save-button:
+toolbar-info-button:
+toolbar-edit-button:
+toolbar-close-button:
+toolbar-delete-button:
+toolbar-cancel-button:
+toolbar-done-button:
 untagged-background: #999999
 very-muted-foreground: #888888
diff --git a/core/palettes/Blue.tid b/core/palettes/Blue.tid
index d0316419f..d7c9ca4e6 100644
--- a/core/palettes/Blue.tid
+++ b/core/palettes/Blue.tid
@@ -90,5 +90,14 @@ tiddler-link-background: <<colour background>>
 tiddler-link-foreground: <<colour primary>>
 tiddler-subtitle-foreground: #c0c0c0
 tiddler-title-foreground: #5959c0
+toolbar-new-button: #5eb95e
+toolbar-options-button: rgb(128, 88, 165)
+toolbar-save-button: #0e90d2
+toolbar-info-button: #0e90d2
+toolbar-edit-button: rgb(243, 123, 29)
+toolbar-close-button: #dd514c
+toolbar-delete-button: #dd514c
+toolbar-cancel-button: rgb(243, 123, 29)
+toolbar-done-button: #5eb95e
 untagged-background: #999999
 very-muted-foreground: #888888
diff --git a/core/palettes/Contrast.tid b/core/palettes/Contrast.tid
index 031c0dd93..c271c137d 100644
--- a/core/palettes/Contrast.tid
+++ b/core/palettes/Contrast.tid
@@ -90,5 +90,14 @@ tiddler-link-background: <<colour background>>
 tiddler-link-foreground: <<colour primary>>
 tiddler-subtitle-foreground: #c0c0c0
 tiddler-title-foreground: #182955
+toolbar-new-button:
+toolbar-options-button:
+toolbar-save-button:
+toolbar-info-button:
+toolbar-edit-button:
+toolbar-close-button:
+toolbar-delete-button:
+toolbar-cancel-button:
+toolbar-done-button:
 untagged-background: #999999
 very-muted-foreground: #888888
diff --git a/core/palettes/Rocker.tid b/core/palettes/Rocker.tid
index 8ac6cb558..f2a04f6ab 100644
--- a/core/palettes/Rocker.tid
+++ b/core/palettes/Rocker.tid
@@ -90,5 +90,14 @@ tiddler-link-background: <<colour background>>
 tiddler-link-foreground: <<colour primary>>
 tiddler-subtitle-foreground: #c0c0c0
 tiddler-title-foreground: #cc0000
+toolbar-new-button:
+toolbar-options-button:
+toolbar-save-button:
+toolbar-info-button:
+toolbar-edit-button:
+toolbar-close-button:
+toolbar-delete-button:
+toolbar-cancel-button:
+toolbar-done-button:
 untagged-background: #999999
 very-muted-foreground: #888888
diff --git a/core/palettes/Vanilla.tid b/core/palettes/Vanilla.tid
index ed5251889..abcdc2f3e 100644
--- a/core/palettes/Vanilla.tid
+++ b/core/palettes/Vanilla.tid
@@ -90,5 +90,14 @@ tiddler-link-background: <<colour background>>
 tiddler-link-foreground: <<colour primary>>
 tiddler-subtitle-foreground: #c0c0c0
 tiddler-title-foreground: #182955
+toolbar-new-button:
+toolbar-options-button:
+toolbar-save-button:
+toolbar-info-button:
+toolbar-edit-button:
+toolbar-close-button:
+toolbar-delete-button:
+toolbar-cancel-button:
+toolbar-done-button:
 untagged-background: #999999
 very-muted-foreground: #888888
diff --git a/themes/tiddlywiki/starlight/styles.tid b/themes/tiddlywiki/starlight/styles.tid
index 25b374277..769fb4cc2 100644
--- a/themes/tiddlywiki/starlight/styles.tid
+++ b/themes/tiddlywiki/starlight/styles.tid
@@ -22,44 +22,3 @@ html body {
 .tw-page-controls svg {
   <<filter "drop-shadow(1px 1px 2px rgba(255,255,255,0.9))">>
 }
-
-/*
-** Some rainbow icon colours
-*/
-
-svg.tw-image-new-button {
-  fill: #5eb95e; /* Green */
-}
-
-svg.tw-image-options-button {
-  fill: rgb(128, 88, 165); /* Purple */
-}
-
-svg.tw-image-save-button {
-  fill: #0e90d2; /* Light blue */
-}
-
-.tw-tiddler-controls button svg.tw-image-info-button {
-  fill: #0e90d2; /* Light blue */
-}
-
-.tw-tiddler-controls button svg.tw-image-edit-button {
-  fill: rgb(243, 123, 29); /* Orange */
-}
-
-.tw-tiddler-controls button svg.tw-image-close-button {
-  fill: #dd514c; /* Red */
-}
-
-.tw-tiddler-controls button svg.tw-image-delete-button {
-  fill: #dd514c; /* Red */
-}
-
-.tw-tiddler-controls button svg.tw-image-cancel-button {
-  fill: rgb(243, 123, 29); /* Orange */
-}
-
-.tw-tiddler-controls button svg.tw-image-done-button {
-  fill: #5eb95e; /* Green */
-}
-
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index c8764bf62..5cced0ba4 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -559,6 +559,46 @@ canvas.tw-edit-bitmapeditor  {
 	display: block;
 }
 
+/*
+** Toolbar buttons
+*/
+
+.tw-page-controls svg.tw-image-new-button {
+  fill: <<colour toolbar-new-button>>;
+}
+
+.tw-page-controls svg.tw-image-options-button {
+  fill: <<colour toolbar-options-button>>;
+}
+
+.tw-page-controls svg.tw-image-save-button {
+  fill: <<colour toolbar-save-button>>;
+}
+
+.tw-tiddler-controls button svg.tw-image-info-button {
+  fill: <<colour toolbar-info-button>>;
+}
+
+.tw-tiddler-controls button svg.tw-image-edit-button {
+  fill: <<colour toolbar-edit-button>>;
+}
+
+.tw-tiddler-controls button svg.tw-image-close-button {
+  fill: <<colour toolbar-close-button>>;
+}
+
+.tw-tiddler-controls button svg.tw-image-delete-button {
+  fill: <<colour toolbar-delete-button>>;
+}
+
+.tw-tiddler-controls button svg.tw-image-cancel-button {
+  fill: <<colour toolbar-cancel-button>>;
+}
+
+.tw-tiddler-controls button svg.tw-image-done-button {
+  fill: <<colour toolbar-done-button>>;
+}
+
 /*
 ** Tiddler edit mode
 */