diff --git a/dash-frontend/assets/gui/dashboard.xml b/dash-frontend/assets/gui/dashboard.xml
index 5a3d073e..c94ad66a 100644
--- a/dash-frontend/assets/gui/dashboard.xml
+++ b/dash-frontend/assets/gui/dashboard.xml
@@ -17,7 +17,7 @@
       tooltip="${tooltip}"
       tooltip_side="${tooltip_side}"
     >
-      <sprite src_builtin="${src_builtin}" width="~side_sprite_size" height="~side_sprite_size" color="on_background_contrast" />
+      <sprite src_builtin="${src_builtin}" width="~side_sprite_size" height="~side_sprite_size" />
     </Button>
   </template>
 
diff --git a/dash-frontend/assets/gui/t_dropdown_button.xml b/dash-frontend/assets/gui/t_dropdown_button.xml
index a5357772..c240285d 100644
--- a/dash-frontend/assets/gui/t_dropdown_button.xml
+++ b/dash-frontend/assets/gui/t_dropdown_button.xml
@@ -15,9 +15,9 @@
       </div>
       <div gap="2">
         <div padding_top="4" padding_bottom="4">
-          <rectangle width="2" height="100%" color="#FFFFFF1A" />
+          <rectangle width="2" height="100%" color="outline" />
         </div>
-        <sprite margin_left="-4" width="30" height="30" color="on_background_variant" src_builtin="dashboard/down.svg" />
+        <sprite margin_left="-4" width="30" height="30" src_builtin="dashboard/down.svg" />
       </div>
     </Button>
   </template>
diff --git a/dash-frontend/assets/gui/t_menu_button.xml b/dash-frontend/assets/gui/t_menu_button.xml
index 2ce56baa..565b62d4 100644
--- a/dash-frontend/assets/gui/t_menu_button.xml
+++ b/dash-frontend/assets/gui/t_menu_button.xml
@@ -11,8 +11,8 @@
         align_items="center"
         justify_content="center"
         flex_direction="column">
-        <sprite src_builtin="${icon}" width="32" height="32" color="on_background"/>
-        <label weight="bold" size="18" text="${text}" translation="${translation}" color="on_background" />
+        <sprite src_builtin="${icon}" width="32" height="32" />
+        <label weight="bold" size="18" text="${text}" translation="${translation}" />
       </div>
     </Button>
   </template>
diff --git a/dash-frontend/assets/gui/tab/apps.xml b/dash-frontend/assets/gui/tab/apps.xml
index ae2eff8d..11be8a1d 100644
--- a/dash-frontend/assets/gui/tab/apps.xml
+++ b/dash-frontend/assets/gui/tab/apps.xml
@@ -41,7 +41,7 @@
     -->
     <rectangle macro="group_box">
       <div align_items="center" gap="8">
-        <sprite src_builtin="dashboard/heart_plus.svg" min_width="24" min_height="24"/>
+        <sprite src_builtin="dashboard/heart_plus.svg" color="primary"  min_width="24" min_height="24"/>
         <label translation="PINNED_APPS"/>
       </div>
       <div id="pinned_apps_parent" flex_direction="row" flex_wrap="wrap" gap="4">
diff --git a/dash-frontend/assets/gui/tab/home.xml b/dash-frontend/assets/gui/tab/home.xml
index 66cd8f21..0f3d0c38 100644
--- a/dash-frontend/assets/gui/tab/home.xml
+++ b/dash-frontend/assets/gui/tab/home.xml
@@ -21,15 +21,15 @@
 
       <div gap="8">
         <Button id="btn_welcome_screen" macro="home_button" tooltip="APP_SETTINGS.SHOW_WELCOME_SCREEN">
-          <sprite src_builtin="dashboard/welcome.svg" width="32" height="32" margin="16" color="on_background"/>
+          <sprite src_builtin="dashboard/welcome.svg" width="32" height="32" margin="16" />
         </Button>
 
         <Button id="btn_website" macro="home_button" tooltip_str="wayvr.org">
-          <sprite src_builtin="dashboard/globe.svg" width="32" height="32" margin="16" color="on_background"/>
+          <sprite src_builtin="dashboard/globe.svg" width="32" height="32" margin="16" />
         </Button>
 
         <Button id="btn_donate" macro="home_button" tooltip="DONATE.SUPPORT_US">
-          <sprite src_builtin="dashboard/opencollective.svg" width="32" height="32" margin="16" color="on_background"/>
+          <sprite src_builtin="dashboard/opencollective.svg" width="32" height="32" margin="16" />
         </Button>
       </div>
     </div>
diff --git a/dash-frontend/assets/gui/tab/settings.xml b/dash-frontend/assets/gui/tab/settings.xml
index f5e2d698..5480b658 100644
--- a/dash-frontend/assets/gui/tab/settings.xml
+++ b/dash-frontend/assets/gui/tab/settings.xml
@@ -33,15 +33,15 @@
 
   <template name="ButtonText">
     <Button id="${id}" height="32" tooltip="${translation}_HELP" padding="4" gap="8">
-      <sprite src_builtin="${icon}" height="24" width="24" color="on_background" />
-      <label align="left" translation="${translation}" weight="bold" min_width="200" color="on_background" />
+      <sprite src_builtin="${icon}" height="24" width="24" />
+      <label align="left" translation="${translation}" weight="bold" min_width="200" />
     </Button>
   </template>
 
   <template name="DangerButton">
     <Button id="${id}" color="danger" border_color="danger(rgb-mult-0.5)" height="32" tooltip="${translation}_HELP" padding="4" gap="8">
-      <sprite src_builtin="${icon}" height="24" width="24" color="on_danger" />
-      <label align="left" translation="${translation}" weight="bold" min_width="200" color="on_danger" />
+      <sprite src_builtin="${icon}" height="24" width="24" />
+      <label align="left" translation="${translation}" weight="bold" min_width="200" />
     </Button>
   </template>
 
diff --git a/dash-frontend/assets/gui/tab/welcome_page_5.xml b/dash-frontend/assets/gui/tab/welcome_page_5.xml
index 4efbc2c6..48c04d36 100644
--- a/dash-frontend/assets/gui/tab/welcome_page_5.xml
+++ b/dash-frontend/assets/gui/tab/welcome_page_5.xml
@@ -12,7 +12,7 @@
         <label size="16" wrap="1" translation="WELCOME.BASICS"/>
         <label size="16" wrap="1" translation="WELCOME.FEATURES_DOCUMENTATION"/>
         <Button id="btn_wayvr_org" align_self="baseline" min_height="32">
-          <sprite src_builtin="dashboard/globe.svg" width="24" height="24" color="primary" margin="8"/>
+          <sprite src_builtin="dashboard/globe.svg" width="24" height="24" margin="8"/>
           <label size="18" weight="bold" text="wayvr.org" margin_right="8" />
         </Button>
 
diff --git a/dash-frontend/assets/gui/view/game_launcher.xml b/dash-frontend/assets/gui/view/game_launcher.xml
index ba9d950a..15cf6feb 100644
--- a/dash-frontend/assets/gui/view/game_launcher.xml
+++ b/dash-frontend/assets/gui/view/game_launcher.xml
@@ -9,9 +9,9 @@
           <label weight="bold" id="label_author" text="Unknown" />
         </div>
         <label id="label_description" wrap="1" text="No description available" />
-        <Button id="btn_launch" align_self="baseline" color="#44ce22ff" border_color="#44ce22ff" padding_top="4" padding_bottom="4" round="8" padding_right="12" min_width="200" min_height="40">
+        <Button id="btn_launch" align_self="baseline" color="primary" border_color="primary(rgb-mult-0.5)" padding_top="4" padding_bottom="4" round="8" padding_right="12" min_width="200" min_height="40">
           <sprite src_builtin="dashboard/play.svg" width="32" height="32" />
-          <label text="Launch" weight="bold" size="17" color="#FFFFFF" shadow="#00000099" />
+          <label text="Launch" weight="bold" size="17" />
         </Button>
       </div>
     </div>
diff --git a/dash-frontend/assets/gui/view/input_profiles.xml b/dash-frontend/assets/gui/view/input_profiles.xml
index 28b022cb..88406da7 100644
--- a/dash-frontend/assets/gui/view/input_profiles.xml
+++ b/dash-frontend/assets/gui/view/input_profiles.xml
@@ -2,7 +2,7 @@
   <!-- id, text -->
   <template name="InputProfileButton">
     <Button id="${id}" width="350" gap="8" justify_content="start" >
-      <sprite margin_left="8" src_builtin="dashboard/controller.svg" min_width="24" min_height="24" color="on_background"/>
+      <sprite margin_left="8" src_builtin="dashboard/controller.svg" min_width="24" min_height="24" />
       <label text="${text}" weight="bold"/>
     </Button>
   </template>
diff --git a/dash-frontend/assets/gui/view/popup_window.xml b/dash-frontend/assets/gui/view/popup_window.xml
index f81760a1..88245458 100644
--- a/dash-frontend/assets/gui/view/popup_window.xml
+++ b/dash-frontend/assets/gui/view/popup_window.xml
@@ -23,7 +23,7 @@
         <div gap="16" align_items="center">
           <!-- Back button -->
           <Button id="but_back" width="48" height="48" color="on_background_contrast(transparent)" border_color="on_background_contrast(transparent)">
-            <sprite src_builtin="dashboard/back.svg" color="on_background_contrast" width="24" height="24" />
+            <sprite src_builtin="dashboard/back.svg" width="24" height="24" />
           </Button>
 
           <!-- Title -->