diff --git a/templates/home.html b/templates/home.html
index fefc423..3bced95 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -53,12 +53,7 @@
                         <img src="/static/icons/image.svg" alt="Toggle theme" />
                     </a>
                 </div>
-                <div class="icon">
-                    <a href="/options/theme?redirect_url={{ .currentUrl }}">
-                        <img src="/static/icons/{{ if eq .theme "dark" }}sun{{
-                        else }}moon{{ end }}.svg" alt="Toggle theme" />
-                    </a>
-                </div>
+                {{ template "themeSwitcher.html" .}}
             </div>
             <p class="footer">
                 Brought to you by
diff --git a/templates/question.html b/templates/question.html
index 154b756..7dbd909 100644
--- a/templates/question.html
+++ b/templates/question.html
@@ -21,12 +21,7 @@
                         alt="4 circles with alternating colors between green and white"
                     />
                 </a>
-                <div class="icon">
-                    <a href="/options/theme?redirect_url={{ .currentUrl }}">
-                        <img src="/static/icons/{{ if eq .theme "dark" }}sun{{
-                        else }}moon{{ end }}.svg" alt="Toggle theme" />
-                    </a>
-                </div>
+                {{ template "themeSwitcher.html" .}}
             </div>
             <div class="card">
                 <div class="card-header">
diff --git a/templates/themeSwitcher.html b/templates/themeSwitcher.html
new file mode 100644
index 0000000..a34b512
--- /dev/null
+++ b/templates/themeSwitcher.html
@@ -0,0 +1,6 @@
+<div class="icon">
+    <a href="/options/theme?redirect_url={{ .currentUrl }}">
+        <img src="/static/icons/{{ if eq .theme "dark" }}sun{{
+        else }}moon{{ end }}.svg" alt="Toggle theme" />
+    </a>
+</div>