diff --git a/qml/SettingsDialog.qml b/qml/SettingsDialog.qml
index 725b39e..7853305 100644
--- a/qml/SettingsDialog.qml
+++ b/qml/SettingsDialog.qml
@@ -69,6 +69,12 @@ Popup {
         border.color: appTheme.style.lineColor
         border.width: 0
 
+        Behavior on color {
+            ColorAnimation {
+                duration: 200
+            }
+        }
+
         RectangularGlow {
             id: effect_2
             glowRadius: 7
@@ -77,7 +83,6 @@ Popup {
             opacity: 0.18
             anchors.fill: headlineUnderline
             scale: 1
-
         }
 
         Canvas {
@@ -96,6 +101,12 @@ Popup {
 
             property color color: appTheme.style.viewColor
 
+            Behavior on color {
+                ColorAnimation {
+                    duration: 200
+                }
+            }
+
             onColorChanged: {
                 requestPaint()
             }
diff --git a/qml/SpeedTimer.qml b/qml/SpeedTimer.qml
index 36b930d..b0e2760 100644
--- a/qml/SpeedTimer.qml
+++ b/qml/SpeedTimer.qml
@@ -4,7 +4,6 @@ import QtQuick.Window 2.2
 import QtQuick.Controls 2.2
 import "."
 import "./components"
-import "./styles"
 import com.itsblue.speedclimbingstopwatch 1.0
 
 Item {
diff --git a/qml/components/FancyButton.qml b/qml/components/FancyButton.qml
index 96dd6a4..81f9bcc 100644
--- a/qml/components/FancyButton.qml
+++ b/qml/components/FancyButton.qml
@@ -24,6 +24,12 @@ Button {
         }
     }
 
+    Behavior on backgroundColor {
+        ColorAnimation {
+            duration: 200
+        }
+    }
+
     background: Item {
         id: controlBackgroundContainer
 
diff --git a/qml/main.qml b/qml/main.qml
index 3a2277c..43548e9 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -49,6 +49,12 @@ Window {
             id: backgroundRect
             anchors.fill: parent
             color: appTheme.style.backgroundColor
+
+            Behavior on color {
+                ColorAnimation {
+                    duration: 200
+                }
+            }
         }
 
         SpeedBackend {
@@ -107,6 +113,12 @@ Window {
             Rectangle {
                 anchors.fill: parent
                 color: appTheme.style.menuColor
+
+                Behavior on color {
+                    ColorAnimation {
+                        duration: 200
+                    }
+                }
             }
 
             Label {
@@ -157,7 +169,7 @@ Window {
                 id: baseConnConnIcon
                 status: speedBackend.baseStationState
 
-                source: "qrc:/graphics/icons/BaseStation_black.png"
+                source: appTheme.style.baseStationIcon
                 anchors {
                     top: parent.top
                     topMargin: 10
@@ -172,7 +184,7 @@ Window {
                 id: buzzerConnIcon
                 status: speedBackend.baseStationConnections[1]["state"]
 
-                source: "qrc:/graphics/icons/buzzer_black.png"
+                source: appTheme.style.buzzerIcon
                 anchors {
                     top: parent.top
                     topMargin: 10
@@ -186,7 +198,7 @@ Window {
                 id: startpadConnIcon
                 status: speedBackend.baseStationConnections[0]["state"]
 
-                source: "qrc:/graphics/icons/startpad_black.png"
+                source: appTheme.style.startpadIcon
                 anchors {
                     top: parent.top
                     topMargin: 10
@@ -397,6 +409,12 @@ Window {
                 id: lowerMenuBackground
                 anchors.fill: parent
                 color: appTheme.style.menuColor
+
+                Behavior on color {
+                    ColorAnimation {
+                        duration: 200
+                    }
+                }
             }
 
             FancyButton {
diff --git a/shared.qrc b/shared.qrc
index 4eeeff4..ada88d1 100644
--- a/shared.qrc
+++ b/shared.qrc
@@ -24,5 +24,7 @@
         <file>graphics/icons/error.png</file>
         <file>graphics/icons/BaseStation.png</file>
         <file>graphics/icons/BaseStation_black.png</file>
+        <file>graphics/icons/buzzer.png</file>
+        <file>graphics/icons/startpad.png</file>
     </qresource>
 </RCC>
diff --git a/sources/apptheme.cpp b/sources/apptheme.cpp
index 5939698..e955b11 100644
--- a/sources/apptheme.cpp
+++ b/sources/apptheme.cpp
@@ -29,7 +29,10 @@ AppTheme::AppTheme(QObject *parent) : QObject(parent)
         {"lineColor", "grey"},
 
         {"backIcon", "qrc:/graphics/icons/back.png"},
-        {"settIcon", "qrc:/graphics/icons/settings.png"}
+        {"settIcon", "qrc:/graphics/icons/settings.png"},
+        {"buzzerIcon", "qrc:/graphics/icons/buzzer.png"},
+        {"startpadIcon", "qrc:/graphics/icons/startpad.png"},
+        {"baseStationIcon", "qrc:/graphics/icons/BaseStation.png"}
 
     };
     this->darkTheme = tmpDarkTheme;
@@ -60,7 +63,10 @@ AppTheme::AppTheme(QObject *parent) : QObject(parent)
         {"lineColor", "grey"},
 
         {"backIcon", "qrc:/graphics/icons/back_black.png"},
-        {"settIcon", "qrc:/graphics/icons/settings_black.png"}
+        {"settIcon", "qrc:/graphics/icons/settings_black.png"},
+        {"buzzerIcon", "qrc:/graphics/icons/buzzer_black.png"},
+        {"startpadIcon", "qrc:/graphics/icons/startpad_black.png"},
+        {"baseStationIcon", "qrc:/graphics/icons/BaseStation_black.png"}
 
     };
     this->lightTheme = tmpLightTheme;