diff --git a/src/displayapp/icons/music/disc.c b/src/displayapp/icons/music/disc.c
deleted file mode 100644
index 0957873f87..0000000000
--- a/src/displayapp/icons/music/disc.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*  Copyright (C) 2020 Avamander
-
-    This file is part of InfiniTime.
-
-    InfiniTime is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    InfiniTime is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "lvgl/lvgl.h"
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_DISC
-#define LV_ATTRIBUTE_IMG_DISC
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_IMG_DISC uint8_t disc_map[] = {
-    0xbd, 0xc1, 0xbe, 0xff,  /* Color of index 0: foreground */
-    0x00, 0x00, 0x00, 0x00,  /* Color of index 1: background */
-    
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xc0, 0x01, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xfc, 0x00, 0x00, 0x1f, 0xff, 0xff,
-    0xff, 0xff, 0xf0, 0x0f, 0xf8, 0x07, 0xff, 0xff,
-    0xff, 0xff, 0xc0, 0xff, 0xff, 0x81, 0xff, 0xff,
-    0xff, 0xff, 0x07, 0xff, 0xff, 0xf0, 0x7f, 0xff,
-    0xff, 0xfc, 0x1f, 0xff, 0xff, 0xfc, 0x1f, 0xff,
-    0xff, 0xf8, 0x7f, 0xff, 0xff, 0xff, 0x0f, 0xff,
-    0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0x87, 0xff,
-    0xff, 0xe3, 0xff, 0xff, 0xff, 0xff, 0xe3, 0xff,
-    0xff, 0xc7, 0xff, 0xff, 0xff, 0xff, 0xf1, 0xff,
-    0xff, 0x8f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xff,
-    0xff, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x7f,
-    0xfe, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x3f,
-    0xfc, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f,
-    0xfc, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f,
-    0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f,
-    0xf9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf,
-    0xf1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc7,
-    0xf3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7,
-    0xe3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe3,
-    0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf3,
-    0xc7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf1,
-    0xc7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf1,
-    0xcf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf9,
-    0xcf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf9,
-    0x8f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8,
-    0x8f, 0xff, 0xff, 0xf8, 0x0f, 0xff, 0xff, 0xf8,
-    0x9f, 0xff, 0xff, 0xf0, 0x07, 0xff, 0xff, 0xfc,
-    0x9f, 0xff, 0xff, 0xe3, 0xe3, 0xff, 0xff, 0xfc,
-    0x9f, 0xff, 0xff, 0xe7, 0xf3, 0xff, 0xff, 0xfc,
-    0x9f, 0xff, 0xff, 0xe7, 0xf3, 0xff, 0xff, 0xfc,
-    0x9f, 0xff, 0xff, 0xe7, 0xf3, 0xff, 0xff, 0xfc,
-    0x9f, 0xff, 0xff, 0xe7, 0xf3, 0xff, 0xff, 0xfc,
-    0x9f, 0xff, 0xff, 0xe7, 0xf3, 0xff, 0xff, 0xfc,
-    0x9f, 0xff, 0xff, 0xe3, 0xe3, 0xff, 0xff, 0xfc,
-    0x9f, 0xff, 0xff, 0xf0, 0x07, 0xff, 0xff, 0xfc,
-    0x8f, 0xff, 0xff, 0xf8, 0x0f, 0xff, 0xff, 0xf8,
-    0x8f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8,
-    0xcf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf9,
-    0xcf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf9,
-    0xc7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf1,
-    0xc7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf1,
-    0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf3,
-    0xe3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe3,
-    0xf3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7,
-    0xf1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc7,
-    0xf9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf,
-    0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f,
-    0xfc, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f,
-    0xfc, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f,
-    0xfe, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x3f,
-    0xff, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x7f,
-    0xff, 0x8f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xff,
-    0xff, 0xc7, 0xff, 0xff, 0xff, 0xff, 0xf1, 0xff,
-    0xff, 0xe3, 0xff, 0xff, 0xff, 0xff, 0xe3, 0xff,
-    0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0x87, 0xff,
-    0xff, 0xf8, 0x7f, 0xff, 0xff, 0xff, 0x0f, 0xff,
-    0xff, 0xfc, 0x1f, 0xff, 0xff, 0xfc, 0x1f, 0xff,
-    0xff, 0xff, 0x07, 0xff, 0xff, 0xf0, 0x7f, 0xff,
-    0xff, 0xff, 0xc0, 0xff, 0xff, 0x81, 0xff, 0xff,
-    0xff, 0xff, 0xf0, 0x0f, 0xf8, 0x07, 0xff, 0xff,
-    0xff, 0xff, 0xfc, 0x00, 0x00, 0x1f, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xc0, 0x01, 0xff, 0xff, 0xff,
-};
-
-const lv_img_dsc_t disc = {
-    {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        64,
-        64
-    },
-    520,
-    disc_map
-};
\ No newline at end of file
diff --git a/src/displayapp/icons/music/disc.png b/src/displayapp/icons/music/disc.png
deleted file mode 100644
index 699734fb9c..0000000000
Binary files a/src/displayapp/icons/music/disc.png and /dev/null differ
diff --git a/src/displayapp/icons/music/disc_f_1.c b/src/displayapp/icons/music/disc_f_1.c
deleted file mode 100644
index 9b6b74177f..0000000000
--- a/src/displayapp/icons/music/disc_f_1.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*  Copyright (C) 2020 Avamander
-
-    This file is part of InfiniTime.
-
-    InfiniTime is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    InfiniTime is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "lvgl/lvgl.h"
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_DISC_F_1
-#define LV_ATTRIBUTE_IMG_DISC_F_1
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_IMG_DISC_F_1 uint8_t disc_f_1_map[] = {
-    0xbd, 0xc1, 0xbe, 0xff,  /* Color of index 0: foreground */
-    0x00, 0x00, 0x00, 0x00,  /* Color of index 1: background */
-    
-    0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xc0,
-    0xff, 0xff, 0xfc, 0x00,
-    0xff, 0xff, 0xf0, 0x0f,
-    0xff, 0xff, 0xc0, 0xff,
-    0xff, 0xff, 0x07, 0xff,
-    0xff, 0xfc, 0x1f, 0xff,
-    0xff, 0xf8, 0x7f, 0xff,
-    0xff, 0xf0, 0xff, 0xff,
-    0xff, 0xe3, 0xff, 0xff,
-    0xff, 0xc7, 0xf3, 0xff,
-    0xff, 0x8f, 0xc3, 0xff,
-    0xff, 0x1f, 0x87, 0xff,
-    0xfe, 0x3f, 0x0f, 0xff,
-    0xfc, 0x7e, 0x1f, 0xff,
-    0xfc, 0x7c, 0x3f, 0xff,
-    0xf8, 0xfc, 0x7f, 0xff,
-    0xf9, 0xfc, 0xff, 0xff,
-    0xf1, 0xff, 0xff, 0xff,
-    0xf3, 0xff, 0xff, 0xff,
-    0xe3, 0xff, 0xff, 0xff,
-    0xe7, 0xff, 0xff, 0xff,
-    0xc7, 0xff, 0xff, 0xff,
-    0xc7, 0xff, 0xff, 0xff,
-    0xcf, 0xff, 0xff, 0xff,
-    0xcf, 0xff, 0xff, 0xff,
-    0x8f, 0xff, 0xff, 0xff,
-    0x8f, 0xff, 0xff, 0xf8,
-    0x9f, 0xff, 0xff, 0xf0,
-    0x9f, 0xff, 0xff, 0xe3,
-    0x9f, 0xff, 0xff, 0xe7,
-    0x9f, 0xff, 0xff, 0xe7,
-};
-
-const lv_img_dsc_t disc_f_1 = {
-    {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        32,
-        32
-    },
-    136,
-    disc_f_1_map
-};
-
diff --git a/src/displayapp/icons/music/disc_f_1.png b/src/displayapp/icons/music/disc_f_1.png
deleted file mode 100644
index 946577344a..0000000000
Binary files a/src/displayapp/icons/music/disc_f_1.png and /dev/null differ
diff --git a/src/displayapp/icons/music/disc_f_2.c b/src/displayapp/icons/music/disc_f_2.c
deleted file mode 100644
index 3d2331d171..0000000000
--- a/src/displayapp/icons/music/disc_f_2.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*  Copyright (C) 2020 Avamander
-
-    This file is part of InfiniTime.
-
-    InfiniTime is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    InfiniTime is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "lvgl/lvgl.h"
-
-#ifndef LV_ATTRIBUTE_MEM_ALIGN
-#define LV_ATTRIBUTE_MEM_ALIGN
-#endif
-
-#ifndef LV_ATTRIBUTE_IMG_DISC_F_2
-#define LV_ATTRIBUTE_IMG_DISC_F_2
-#endif
-
-const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_IMG_DISC_F_2 uint8_t disc_f_2_map[] = {
-    0xbd, 0xc1, 0xbe, 0xff,  /* Color of index 0: foreground */
-    0x00, 0x00, 0x00, 0x00,  /* Color of index 1: background */
-    
-    0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xc0,
-    0xff, 0xff, 0xfc, 0x00,
-    0xff, 0xff, 0xf0, 0x0f,
-    0xff, 0xff, 0xc0, 0xff,
-    0xff, 0xff, 0x07, 0xff,
-    0xff, 0xfc, 0x1f, 0xff,
-    0xff, 0xf8, 0x7f, 0xf1,
-    0xff, 0xf0, 0xff, 0x00,
-    0xff, 0xe3, 0xfc, 0x03,
-    0xff, 0xc7, 0xf0, 0x3f,
-    0xff, 0x8f, 0xf0, 0xff,
-    0xff, 0x1f, 0xf3, 0xff,
-    0xfe, 0x3f, 0xff, 0xff,
-    0xfc, 0x7f, 0xff, 0xff,
-    0xfc, 0x7f, 0xff, 0xff,
-    0xf8, 0xff, 0xff, 0xff,
-    0xf9, 0xff, 0xff, 0xff,
-    0xf1, 0xff, 0xff, 0xff,
-    0xf3, 0xff, 0xff, 0xff,
-    0xe3, 0xff, 0xff, 0xff,
-    0xe7, 0xff, 0xff, 0xff,
-    0xc7, 0xff, 0xff, 0xff,
-    0xc7, 0xff, 0xff, 0xff,
-    0xcf, 0xff, 0xff, 0xff,
-    0xcf, 0xff, 0xff, 0xff,
-    0x8f, 0xff, 0xff, 0xff,
-    0x8f, 0xff, 0xff, 0xf8,
-    0x9f, 0xff, 0xff, 0xf0,
-    0x9f, 0xff, 0xff, 0xe3,
-    0x9f, 0xff, 0xff, 0xe7,
-    0x9f, 0xff, 0xff, 0xe7,
-};
-
-const lv_img_dsc_t disc_f_2 = {
-    {
-        LV_IMG_CF_INDEXED_1BIT,
-        0,
-        0,
-        32,
-        32
-    },
-    136,
-    disc_f_2_map
-};
-
diff --git a/src/displayapp/icons/music/disc_f_2.png b/src/displayapp/icons/music/disc_f_2.png
deleted file mode 100644
index 4d9a4a388a..0000000000
Binary files a/src/displayapp/icons/music/disc_f_2.png and /dev/null differ
diff --git a/src/displayapp/screens/Music.cpp b/src/displayapp/screens/Music.cpp
index 0763da0fe3..7d79d33a95 100644
--- a/src/displayapp/screens/Music.cpp
+++ b/src/displayapp/screens/Music.cpp
@@ -20,9 +20,7 @@
 #include <cstdint>
 #include "displayapp/DisplayApp.h"
 #include "components/ble/MusicService.h"
-#include "displayapp/icons/music/disc.c"
-#include "displayapp/icons/music/disc_f_1.c"
-#include "displayapp/icons/music/disc_f_2.c"
+#include "displayapp/InfiniTimeTheme.h"
 
 using namespace Pinetime::Applications::Screens;
 
@@ -52,28 +50,24 @@ Music::Music(Pinetime::Controllers::MusicService& music) : musicService(music) {
 
   lv_style_init(&btn_style);
   lv_style_set_radius(&btn_style, LV_STATE_DEFAULT, 20);
-  lv_style_set_bg_color(&btn_style, LV_STATE_DEFAULT, LV_COLOR_AQUA);
-  lv_style_set_bg_opa(&btn_style, LV_STATE_DEFAULT, LV_OPA_50);
 
   btnVolDown = lv_btn_create(lv_scr_act(), nullptr);
   btnVolDown->user_data = this;
   lv_obj_set_event_cb(btnVolDown, event_handler);
   lv_obj_set_size(btnVolDown, 76, 76);
-  lv_obj_align(btnVolDown, nullptr, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
+  lv_obj_align(btnVolDown, nullptr, LV_ALIGN_IN_TOP_RIGHT, 0, 82);
   lv_obj_add_style(btnVolDown, LV_STATE_DEFAULT, &btn_style);
   label = lv_label_create(btnVolDown, nullptr);
   lv_label_set_text_static(label, Symbols::volumDown);
-  lv_obj_set_hidden(btnVolDown, true);
 
   btnVolUp = lv_btn_create(lv_scr_act(), nullptr);
   btnVolUp->user_data = this;
   lv_obj_set_event_cb(btnVolUp, event_handler);
   lv_obj_set_size(btnVolUp, 76, 76);
-  lv_obj_align(btnVolUp, nullptr, LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0);
+  lv_obj_align(btnVolUp, nullptr, LV_ALIGN_IN_TOP_RIGHT, 0, 0);
   lv_obj_add_style(btnVolUp, LV_STATE_DEFAULT, &btn_style);
   label = lv_label_create(btnVolUp, nullptr);
   lv_label_set_text_static(label, Symbols::volumUp);
-  lv_obj_set_hidden(btnVolUp, true);
 
   btnPrev = lv_btn_create(lv_scr_act(), nullptr);
   btnPrev->user_data = this;
@@ -102,42 +96,31 @@ Music::Music(Pinetime::Controllers::MusicService& music) : musicService(music) {
   txtPlayPause = lv_label_create(btnPlayPause, nullptr);
   lv_label_set_text_static(txtPlayPause, Symbols::play);
 
+  constexpr int8_t MIDDLE_OFFSET = -25;
+  constexpr uint8_t FONT_HEIGHT = 12;
+  constexpr uint8_t LINE_PAD = 15;
   txtTrackDuration = lv_label_create(lv_scr_act(), nullptr);
   lv_label_set_long_mode(txtTrackDuration, LV_LABEL_LONG_SROLL);
-  lv_obj_align(txtTrackDuration, nullptr, LV_ALIGN_IN_TOP_LEFT, 12, 20);
+  lv_obj_align(txtTrackDuration, nullptr, LV_ALIGN_IN_LEFT_MID, 12, MIDDLE_OFFSET + 2 * FONT_HEIGHT + LINE_PAD);
   lv_label_set_text_static(txtTrackDuration, "--:--/--:--");
   lv_label_set_align(txtTrackDuration, LV_ALIGN_IN_LEFT_MID);
   lv_obj_set_width(txtTrackDuration, LV_HOR_RES);
 
-  constexpr uint8_t FONT_HEIGHT = 12;
-  constexpr uint8_t LINE_PAD = 15;
-  constexpr int8_t MIDDLE_OFFSET = -25;
   txtArtist = lv_label_create(lv_scr_act(), nullptr);
   lv_label_set_long_mode(txtArtist, LV_LABEL_LONG_SROLL_CIRC);
-  lv_obj_align(txtArtist, nullptr, LV_ALIGN_IN_LEFT_MID, 12, MIDDLE_OFFSET + 1 * FONT_HEIGHT);
+  lv_obj_align(txtArtist, nullptr, LV_ALIGN_IN_TOP_LEFT, 12, 12);
   lv_label_set_align(txtArtist, LV_ALIGN_IN_LEFT_MID);
-  lv_obj_set_width(txtArtist, LV_HOR_RES - 12);
+  lv_obj_set_width(txtArtist, LV_HOR_RES - 100);
   lv_label_set_text_static(txtArtist, "Artist Name");
 
   txtTrack = lv_label_create(lv_scr_act(), nullptr);
   lv_label_set_long_mode(txtTrack, LV_LABEL_LONG_SROLL_CIRC);
-  lv_obj_align(txtTrack, nullptr, LV_ALIGN_IN_LEFT_MID, 12, MIDDLE_OFFSET + 2 * FONT_HEIGHT + LINE_PAD);
+  lv_obj_align(txtTrack, nullptr, LV_ALIGN_IN_TOP_LEFT, 12, 35);
 
   lv_label_set_align(txtTrack, LV_ALIGN_IN_LEFT_MID);
-  lv_obj_set_width(txtTrack, LV_HOR_RES - 12);
+  lv_obj_set_width(txtTrack, LV_HOR_RES - 100);
   lv_label_set_text_static(txtTrack, "This is a very long getTrack name");
 
-  /** Init animation */
-  imgDisc = lv_img_create(lv_scr_act(), nullptr);
-  lv_img_set_src_arr(imgDisc, &disc);
-  lv_obj_align(imgDisc, nullptr, LV_ALIGN_IN_TOP_RIGHT, -15, 15);
-
-  imgDiscAnim = lv_img_create(lv_scr_act(), nullptr);
-  lv_img_set_src_arr(imgDiscAnim, &disc_f_1);
-  lv_obj_align(imgDiscAnim, nullptr, LV_ALIGN_IN_TOP_RIGHT, -15 - 32, 15);
-
-  frameB = false;
-
   musicService.event(Controllers::MusicService::EVENT_MUSIC_OPEN);
 
   taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
@@ -182,13 +165,6 @@ void Music::Refresh() {
     lv_label_set_text_static(txtPlayPause, Symbols::pause);
     if (xTaskGetTickCount() - 1024 >= lastIncrement) {
 
-      if (frameB) {
-        lv_img_set_src(imgDiscAnim, &disc_f_1);
-      } else {
-        lv_img_set_src(imgDiscAnim, &disc_f_2);
-      }
-      frameB = !frameB;
-
       if (currentPosition >= totalLength) {
         // Let's assume the getTrack finished, paused when the timer ends
         //  and there's no new getTrack being sent to us
@@ -251,33 +227,15 @@ void Music::OnObjectEvent(lv_obj_t* obj, lv_event_t event) {
 bool Music::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
   switch (event) {
     case TouchEvents::SwipeUp: {
-      lv_obj_set_hidden(btnVolDown, false);
-      lv_obj_set_hidden(btnVolUp, false);
-
-      lv_obj_set_hidden(btnNext, true);
-      lv_obj_set_hidden(btnPrev, true);
+      musicService.event(Controllers::MusicService::EVENT_MUSIC_VOLUP);
       return true;
     }
     case TouchEvents::SwipeDown: {
-      if (lv_obj_get_hidden(btnNext)) {
-        lv_obj_set_hidden(btnNext, false);
-        lv_obj_set_hidden(btnPrev, false);
-        lv_obj_set_hidden(btnVolDown, true);
-        lv_obj_set_hidden(btnVolUp, true);
-        return true;
-      }
-      return false;
-    }
-    case TouchEvents::SwipeLeft: {
-      musicService.event(Controllers::MusicService::EVENT_MUSIC_NEXT);
-      return true;
-    }
-    case TouchEvents::SwipeRight: {
-      musicService.event(Controllers::MusicService::EVENT_MUSIC_PREV);
+      musicService.event(Controllers::MusicService::EVENT_MUSIC_VOLDOWN);
       return true;
     }
     default: {
       return false;
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/displayapp/screens/Notifications.cpp b/src/displayapp/screens/Notifications.cpp
index 037c43a7f6..693f8811e2 100644
--- a/src/displayapp/screens/Notifications.cpp
+++ b/src/displayapp/screens/Notifications.cpp
@@ -286,7 +286,7 @@ Notifications::NotificationItem::NotificationItem(const char* title,
   lv_obj_align(alert_count, nullptr, LV_ALIGN_IN_TOP_RIGHT, 0, 16);
 
   lv_obj_t* alert_type = lv_label_create(container, nullptr);
-  lv_obj_set_style_local_text_color(alert_type, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::orange);
+  lv_obj_set_style_local_text_color(alert_type, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
   if (title == nullptr) {
     lv_label_set_text_static(alert_type, "Notification");
   } else {
diff --git a/src/displayapp/screens/Tile.cpp b/src/displayapp/screens/Tile.cpp
index 7c392c59e5..7390ead614 100644
--- a/src/displayapp/screens/Tile.cpp
+++ b/src/displayapp/screens/Tile.cpp
@@ -66,8 +66,7 @@ Tile::Tile(uint8_t screenID,
   lv_obj_align(btnm1, nullptr, LV_ALIGN_CENTER, 0, 10);
 
   lv_obj_set_style_local_radius(btnm1, LV_BTNMATRIX_PART_BTN, LV_STATE_DEFAULT, 20);
-  lv_obj_set_style_local_bg_opa(btnm1, LV_BTNMATRIX_PART_BTN, LV_STATE_DEFAULT, LV_OPA_50);
-  lv_obj_set_style_local_bg_color(btnm1, LV_BTNMATRIX_PART_BTN, LV_STATE_DEFAULT, LV_COLOR_AQUA);
+  lv_obj_set_style_local_bg_color(btnm1, LV_BTNMATRIX_PART_BTN, LV_STATE_DEFAULT, Colors::bg);
   lv_obj_set_style_local_bg_opa(btnm1, LV_BTNMATRIX_PART_BTN, LV_STATE_DISABLED, LV_OPA_50);
   lv_obj_set_style_local_bg_color(btnm1, LV_BTNMATRIX_PART_BTN, LV_STATE_DISABLED, Colors::bgDark);
   lv_obj_set_style_local_pad_all(btnm1, LV_BTNMATRIX_PART_BG, LV_STATE_DEFAULT, 0);