diff --git a/lib/components/PlaybackHistoryScreen/playback_history_list_tile.dart b/lib/components/PlaybackHistoryScreen/playback_history_list_tile.dart
index 449c550b1..df99e1ec9 100644
--- a/lib/components/PlaybackHistoryScreen/playback_history_list_tile.dart
+++ b/lib/components/PlaybackHistoryScreen/playback_history_list_tile.dart
@@ -83,8 +83,8 @@ class _PlaybackHistoryListTileState extends State<PlaybackHistoryListTile> {
                     padding: const EdgeInsets.only(top: 6.0),
                     child: Text(
                       processArtist(widget.item.item.item.artist, context),
-                      style: const TextStyle(
-                          color: Colors.white70,
+                      style: TextStyle(
+                          color: Theme.of(context).textTheme.bodyMedium!.color!,
                           fontSize: 13,
                           fontFamily: 'Lexend Deca',
                           fontWeight: FontWeight.w300,
diff --git a/lib/components/PlayerScreen/queue_list.dart b/lib/components/PlayerScreen/queue_list.dart
index 7c83188ff..a91faf069 100644
--- a/lib/components/PlayerScreen/queue_list.dart
+++ b/lib/components/PlayerScreen/queue_list.dart
@@ -309,14 +309,14 @@ Future<dynamic> showQueueBottomSheet(BuildContext context) {
                           width: 40,
                           height: 3.5,
                           decoration: BoxDecoration(
-                            color: Colors.white,
+                            color: Theme.of(context).textTheme.bodySmall!.color!,
                             borderRadius: BorderRadius.circular(3.5),
                           ),
                         ),
                         const SizedBox(height: 10),
                         Text(AppLocalizations.of(context)!.queue,
-                            style: const TextStyle(
-                                color: Colors.white,
+                            style: TextStyle(
+                                color: Theme.of(context).textTheme.bodyLarge!.color!,
                                 fontFamily: 'Lexend Deca',
                                 fontSize: 18,
                                 fontWeight: FontWeight.w300)),
@@ -694,13 +694,13 @@ class _CurrentTrackState extends State<CurrentTrack> {
             flexibleSpace: Container(
               // width: 58,
               height: albumImageSize,
-              padding: EdgeInsets.symmetric(horizontal: horizontalPadding),
+              padding: const EdgeInsets.symmetric(horizontal: horizontalPadding),
               child: Container(
                 clipBehavior: Clip.antiAlias,
                 decoration: ShapeDecoration(
                   color: Color.alphaBlend(
-                      IconTheme.of(context).color!.withOpacity(0.35),
-                      Colors.black),
+                      Theme.of(context).brightness == Brightness.dark ? IconTheme.of(context).color!.withOpacity(0.35) : IconTheme.of(context).color!.withOpacity(0.5),
+                      Theme.of(context).brightness == Brightness.dark ? Colors.black : Colors.white),
                   shape: const RoundedRectangleBorder(
                     borderRadius: BorderRadius.all(Radius.circular(12.0)),
                   ),
@@ -1414,16 +1414,16 @@ class PreviousTracksSectionHeader extends SliverPersistentHeaderDelegate {
               stream: isRecentTracksExpanded,
               builder: (context, snapshot) {
                 if (snapshot.hasData && snapshot.data!) {
-                  return const Icon(
+                  return Icon(
                     TablerIcons.chevron_up,
                     size: 28.0,
-                    color: Colors.white,
+                    color: Theme.of(context).iconTheme.color!,
                   );
                 } else {
-                  return const Icon(
+                  return Icon(
                     TablerIcons.chevron_down,
                     size: 28.0,
-                    color: Colors.white,
+                    color: Theme.of(context).iconTheme.color!,
                   );
                 }
               }
diff --git a/lib/components/PlayerScreen/queue_list_item.dart b/lib/components/PlayerScreen/queue_list_item.dart
index 3060a03f1..002ee07d0 100644
--- a/lib/components/PlayerScreen/queue_list_item.dart
+++ b/lib/components/PlayerScreen/queue_list_item.dart
@@ -116,8 +116,8 @@ class _QueueListItemState extends State<QueueListItem>
                         padding: const EdgeInsets.only(top: 6.0),
                         child: Text(
                           processArtist(widget.item.item.artist, context),
-                          style: const TextStyle(
-                              color: Colors.white70,
+                          style: TextStyle(
+                              color: Theme.of(context).textTheme.bodyMedium!.color!,
                               fontSize: 13,
                               fontFamily: 'Lexend Deca',
                               fontWeight: FontWeight.w300,
diff --git a/lib/components/now_playing_bar.dart b/lib/components/now_playing_bar.dart
index 3c7b9d876..1b044d529 100644
--- a/lib/components/now_playing_bar.dart
+++ b/lib/components/now_playing_bar.dart
@@ -117,8 +117,8 @@ class NowPlayingBar extends ConsumerWidget {
                                   clipBehavior: Clip.antiAlias,
                                   decoration: ShapeDecoration(
                                     color: Color.alphaBlend(
-                                        IconTheme.of(context).color!.withOpacity(0.35),
-                                        Colors.black),
+                                      Theme.of(context).brightness == Brightness.dark ? IconTheme.of(context).color!.withOpacity(0.35) : IconTheme.of(context).color!.withOpacity(0.5),
+                                      Theme.of(context).brightness == Brightness.dark ? Colors.black : Colors.white),
                                     shape: const RoundedRectangleBorder(
                                       borderRadius: BorderRadius.all(Radius.circular(12.0)),
                                     ),