diff --git a/src/assets/icons/chevron-down.svg b/src/assets/icons/chevron-down.svg
new file mode 100644
index 0000000..29beb9d
--- /dev/null
+++ b/src/assets/icons/chevron-down.svg
@@ -0,0 +1,26 @@
+<!--
+Copyright 2026 Seekra
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+    <path
+        stroke="currentColor"
+        stroke-width="3"
+        fill="none"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        d="M4 8 l8 8 l8 -8"
+    />
+</svg>
\ No newline at end of file
diff --git a/src/assets/icons/circle-black-white.svg b/src/assets/icons/circle-black-white.svg
new file mode 100644
index 0000000..9cff73c
--- /dev/null
+++ b/src/assets/icons/circle-black-white.svg
@@ -0,0 +1,38 @@
+<!--
+Copyright 2026 Seekra
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+    <path
+        fill="currentColor"
+        d="
+            M12 2
+            a10 10 0 0 0 -10 10
+            a10 10 0 0 0 10 10
+            a10 10 0 0 0 10 -10
+            a10 10 0 0 0 -10 -10
+        "
+    />
+    <path
+        style="filter: invert(1)"
+        fill="currentColor"
+        d="
+            M12 3
+            v18
+            a9 9 0 0 0 9 -9
+            a9 9 0 0 0 -9 -9
+        "
+    />
+</svg>
\ No newline at end of file
diff --git a/src/assets/icons/crescent-moon.svg b/src/assets/icons/crescent-moon.svg
new file mode 100644
index 0000000..e2fb3b1
--- /dev/null
+++ b/src/assets/icons/crescent-moon.svg
@@ -0,0 +1,36 @@
+<!--
+Copyright 2026 Seekra
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+    <path
+        fill="currentColor"
+        stroke="none"
+        stroke-width="0"
+        d="
+            M12.621094 23.988281
+            c-6.960938 0 -12.621094 -5.664062000000001 -12.621094 -12.621093
+            c0 -4.8203130000000005 2.683594 -9.148438 7.003906 -11.300781800000001
+            c0.19140600000000063 -0.09765619999999942 0.4257819999999999 -0.058593699999999416 0.578125 0.09374980000000058
+            c0.15234400000000026 0.152344 0.19531300000000051 0.38671900000000003 0.09765699999999988 0.582032
+            c-0.7890629999999996 1.601562 -1.1875 3.320312 -1.1875 5.113281000000001
+            c0.0 6.402342999999999 5.207031 11.613281 11.609374000000003 11.613281
+            c1.8125 0.0 3.550781999999998 -0.41015600000000063 5.167968999999999 -1.2148439999999994
+            c0.19531299999999874 -0.09765600000000063 0.42968799999999874 -0.05859399999999937 0.5820310000000006 0.09375
+            c0.15234399999999937 0.15234399999999937 0.1914069999999981 0.38671899999999937 0.0976569999999981 0.5820319999999981
+            c-2.140625 4.351562000000001 -6.480468999999999 7.058593000000002 -11.328125 7.058593000000002
+        "
+    />
+</svg>
\ No newline at end of file
diff --git a/src/assets/icons/sun.svg b/src/assets/icons/sun.svg
new file mode 100644
index 0000000..8ee19b7
--- /dev/null
+++ b/src/assets/icons/sun.svg
@@ -0,0 +1,45 @@
+<!--
+Copyright 2026 Seekra
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+    <circle fill="currentColor" r="6" cx="12" cy="12" />
+
+    <!-- sunbeams -->
+
+    <!-- left -->
+    <circle fill="currentColor" r="2" cx="3" cy="12" />
+
+    <!-- right -->
+    <circle fill="currentColor" r="2" cx="21" cy="12" />
+
+    <!-- top -->
+    <circle fill="currentColor" r="2" cx="12" cy="3" />
+
+    <!-- top -->
+    <circle fill="currentColor" r="2" cx="12" cy="21" />
+
+    <!-- top left -->
+    <circle fill="currentColor" r="2" cx="5.636038969321072" cy="5.636038969321072" />
+
+    <!-- top right -->
+    <circle fill="currentColor" r="2" cx="18.36396103067893" cy="5.636038969321072" />
+
+    <!-- bottom left -->
+    <circle fill="currentColor" r="2" cx="5.636038969321072" cy="18.36396103067893" />
+
+    <!-- bottom right -->
+    <circle fill="currentColor" r="2" cx="18.36396103067893" cy="18.36396103067893" />
+</svg>
\ No newline at end of file
diff --git a/src/features/colorScheme/components/ColorSchemeButton.vue b/src/features/colorScheme/components/ColorSchemeButton.vue
index 7f4e47e..4f4c228 100644
--- a/src/features/colorScheme/components/ColorSchemeButton.vue
+++ b/src/features/colorScheme/components/ColorSchemeButton.vue
@@ -15,6 +15,8 @@ limitations under the License.
 -->
 
 <script setup>
+import Icon from '@/features/icons/components/Icon.vue';
+
 import { inject } from 'vue';
 import { useI18n } from 'vue-i18n';
 
@@ -29,9 +31,9 @@ const colorSchemeNextMapper = {
 };
 
 const colorSchemeIconMapper = {
-    'dark': '⏾',
-    'light': '☀',
-    'auto': '◐'
+    'dark': 'crescent-moon',
+    'light': 'sun',
+    'auto': 'circle-black-white'
 };
 
 const getTooltipTranslation = function (colorScheme) {
@@ -45,7 +47,10 @@ const getTooltipTranslation = function (colorScheme) {
         :aria-label="getTooltipTranslation(colorScheme)"
         :title="getTooltipTranslation(colorScheme)"
     >
-        {{ colorSchemeIconMapper[colorSchemeNextMapper[colorScheme]] }}
+        <Icon
+            :name="colorSchemeIconMapper[colorSchemeNextMapper[colorScheme]]"
+            size="16"
+        />
     </button>
 </template>
 
diff --git a/src/features/i18n/components/LanguageSwitchButton.vue b/src/features/i18n/components/LanguageSwitchButton.vue
index 25386e2..d878cd3 100644
--- a/src/features/i18n/components/LanguageSwitchButton.vue
+++ b/src/features/i18n/components/LanguageSwitchButton.vue
@@ -15,6 +15,8 @@ limitations under the License.
 -->
 
 <script setup>
+import Icon from '@/features/icons/components/Icon.vue';
+
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { loadLanguage, LANGUAGES_RTL, SUPPORTED_LANGUAGES } from '@/i18n';
@@ -64,7 +66,9 @@ const open = function () {
             aria-haspopup="listbox"
         >
             <span class="lang-code">{{ t(`preferences.locale.languages.${locale}`) }}</span>
-            <span class="chevron" :class="{ open: isOpen }">▾</span>
+            <span class="chevron" :class="{ open: isOpen }">
+                <Icon name="chevron-down" size="1em" />
+            </span>
         </button>
 
         <ul v-if="isOpen" ref="languageDropdown" class="language-dropdown" role="listbox">
diff --git a/src/features/icons/components/Icon.vue b/src/features/icons/components/Icon.vue
new file mode 100644
index 0000000..b70953e
--- /dev/null
+++ b/src/features/icons/components/Icon.vue
@@ -0,0 +1,54 @@
+<!--
+Copyright 2026 Seekra
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<script setup>
+import { computed } from 'vue';
+import { ensureUnit } from '@/utils/cssDimensions';
+
+const props = defineProps({
+    name: {
+        required: true,
+        type: String
+    },
+    size: {
+        type: [Number, String],
+        default: 24
+    }
+})
+
+const icons = import.meta.glob('@/assets/icons/*.svg', {
+    eager: true,
+    import: 'default'
+})
+
+const Icon = computed(() => icons[`/src/assets/icons/${props.name}.svg`])
+
+const size = computed(() => ensureUnit(props.size))
+</script>
+
+<template>
+    <div class="icon-container">
+        <img :src="Icon" :style="{ height: `${size}`, width: `${size}` }" />
+    </div>
+</template>
+
+<style scoped>
+.icon-container {
+    display: flex;
+    align-items: center;
+    filter: var(--invert);
+}
+</style>
\ No newline at end of file
diff --git a/src/styles/variables/colors.css b/src/styles/variables/colors.css
index e79a738..cc2b21f 100644
--- a/src/styles/variables/colors.css
+++ b/src/styles/variables/colors.css
@@ -82,6 +82,8 @@ limitations under the License.
     --blue-box-shadow:    oklch(0.52 0.15 268 / 0.25);
 
     --light-hover:          var(--light-d-2);
+
+    --invert: invert(0);
 }
 
 @media (prefers-color-scheme: dark) {
@@ -114,6 +116,8 @@ limitations under the License.
         --gray-box-shadow:    oklch(0.25 0.0001 271 / 0.7);
 
         --light-hover:          var(--light-d-5);
+
+        --invert: invert(1);
     }
 }
 
@@ -146,4 +150,6 @@ limitations under the License.
     --gray-box-shadow:    oklch(0.25 0.0001 271 / 0.7);
 
     --light-hover:          var(--light-d-5);
+
+    --invert: invert(1);
 }
\ No newline at end of file
diff --git a/src/utils/cssDimensions.js b/src/utils/cssDimensions.js
new file mode 100644
index 0000000..ec1521d
--- /dev/null
+++ b/src/utils/cssDimensions.js
@@ -0,0 +1,31 @@
+/*
+Copyright 2026 Seekra
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+export const ensureUnit = function (d) {
+    if (!d) d = 0;
+
+    // ensure that it is a string
+    if (typeof d === 'number') d = d.toString();
+
+    if (d === '') d = '0';
+
+    // if it ends with a number
+    if (/\d$/.test(d)) {
+        d += 'px';
+    };
+
+    return d;
+};
\ No newline at end of file