diff --git a/approot/misc.xml b/approot/misc.xml
index 78ebf5b2..6fd85b17 100644
--- a/approot/misc.xml
+++ b/approot/misc.xml
@@ -19,6 +19,8 @@
 <message id="Lms.template.edit-btn"><i class="fa fa-fw fa-edit"></i></message>
 <message id="Lms.template.more-btn"><i class="fa fa-fw fa-ellipsis-v"></i></message>
 <message id="Lms.template.play-btn"><i class="fa fa-fw fa-play"></i></message>
+<message id="Lms.template.star-btn"><i class="fa fa-fw fa-star-o"></i></message>
 <message id="Lms.template.toggle-visibility-btn"><i class="fa fa-fw fa-eye"></i></message>
+<message id="Lms.template.unstar-btn"><i class="fa fa-fw fa-star"></i></message>
 
 </messages>
diff --git a/approot/release.xml b/approot/release.xml
index ae16389d..0d856885 100644
--- a/approot/release.xml
+++ b/approot/release.xml
@@ -101,6 +101,7 @@
 		</div>
 		<div class="p-2 d-flex">
 			${play-btn class="d-none d-sm-block btn btn-sm btn-outline-secondary border-0"}
+			${star-btn class="d-none d-sm-block btn btn-sm btn-outline-secondary border-0"}
 			<div class="dropdown d-inline-block">
 				${more-btn data-bs-toggle="dropdown" aria-expanded="false" class="btn btn-sm btn-outline-secondary border-0"}
 				<ul class="dropdown-menu" aria-labelledby="${id:more-btn}">
diff --git a/approot/tracks.xml b/approot/tracks.xml
index f8caea0e..9117cf1b 100644
--- a/approot/tracks.xml
+++ b/approot/tracks.xml
@@ -51,6 +51,7 @@
 		</div>
 		<div class="p-2 d-flex">
 			${play-btn class="d-none d-sm-block btn btn-sm btn-outline-secondary border-0"}
+			${star-btn class="d-none d-sm-block btn btn-sm btn-outline-secondary border-0"}
 			<div class="dropdown d-inline-block">
 				${more-btn data-bs-toggle="dropdown" aria-expanded="false" class="btn btn-sm btn-outline-secondary border-0"}
 				<ul class="dropdown-menu" aria-labelledby="${id:more-btn}">
diff --git a/src/lms/ui/explore/ReleaseView.cpp b/src/lms/ui/explore/ReleaseView.cpp
index 54c7026f..c15a1913 100644
--- a/src/lms/ui/explore/ReleaseView.cpp
+++ b/src/lms/ui/explore/ReleaseView.cpp
@@ -497,21 +497,32 @@ namespace lms::ui
                         _playQueueController.processCommand(PlayQueueController::Command::PlayOrAddLast, { trackId });
                     });
 
-                auto isStarred{ [=] { return core::Service<feedback::IFeedbackService>::get()->isStarred(LmsApp->getUserId(), trackId); } };
+                {
+                    auto isStarred{ [=] { return core::Service<feedback::IFeedbackService>::get()->isStarred(LmsApp->getUserId(), trackId); } };
 
-                Wt::WPushButton* starBtn{ entry->bindNew<Wt::WPushButton>("star", Wt::WString::tr(isStarred() ? "Lms.Explore.unstar" : "Lms.Explore.star")) };
-                starBtn->clicked().connect([=] {
-                    if (isStarred())
-                    {
-                        core::Service<feedback::IFeedbackService>::get()->unstar(LmsApp->getUserId(), trackId);
-                        starBtn->setText(Wt::WString::tr("Lms.Explore.star"));
-                    }
-                    else
-                    {
-                        core::Service<feedback::IFeedbackService>::get()->star(LmsApp->getUserId(), trackId);
-                        starBtn->setText(Wt::WString::tr("Lms.Explore.unstar"));
-                    }
-                });
+                    Wt::WPushButton* starBtn{ entry->bindNew<Wt::WPushButton>("star-btn", Wt::WString::tr(isStarred() ? "Lms.template.unstar-btn" : "Lms.template.star-btn"), Wt::TextFormat::XHTML) };
+                    Wt::WPushButton* starMenuEntry{ entry->bindNew<Wt::WPushButton>("star", Wt::WString::tr(isStarred() ? "Lms.Explore.unstar" : "Lms.Explore.star")) };
+
+                    auto toggle{ [=] {
+                        auto transaction{ LmsApp->getDbSession().createWriteTransaction() };
+
+                        if (isStarred())
+                        {
+                            core::Service<feedback::IFeedbackService>::get()->unstar(LmsApp->getUserId(), trackId);
+                            starMenuEntry->setText(Wt::WString::tr("Lms.Explore.star"));
+                            starBtn->setText(Wt::WString::tr("Lms.template.star-btn"));
+                        }
+                        else
+                        {
+                            core::Service<feedback::IFeedbackService>::get()->star(LmsApp->getUserId(), trackId);
+                            starMenuEntry->setText(Wt::WString::tr("Lms.Explore.unstar"));
+                            starBtn->setText(Wt::WString::tr("Lms.template.unstar-btn"));
+                        }
+                    } };
+
+                    starMenuEntry->clicked().connect([=] { toggle(); });
+                    starBtn->clicked().connect([=] { toggle(); });
+                }
 
                 entry->bindNew<Wt::WPushButton>("download", Wt::WString::tr("Lms.Explore.download"))
                     ->setLink(Wt::WLink{ std::make_unique<DownloadTrackResource>(trackId) });
diff --git a/src/lms/ui/explore/TrackListHelpers.cpp b/src/lms/ui/explore/TrackListHelpers.cpp
index 2cc0bc2f..e4f44f30 100644
--- a/src/lms/ui/explore/TrackListHelpers.cpp
+++ b/src/lms/ui/explore/TrackListHelpers.cpp
@@ -259,6 +259,7 @@ namespace lms::ui::TrackListHelpers
         });
 
         entry->bindNew<Wt::WPushButton>("more-btn", Wt::WString::tr("Lms.template.more-btn"), Wt::TextFormat::XHTML);
+
         entry->bindNew<Wt::WPushButton>("play", Wt::WString::tr("Lms.Explore.play"))
             ->clicked()
             .connect([trackId, &playQueueController] {
@@ -278,21 +279,28 @@ namespace lms::ui::TrackListHelpers
         {
             auto isStarred{ [=] { return core::Service<feedback::IFeedbackService>::get()->isStarred(LmsApp->getUserId(), trackId); } };
 
-            Wt::WPushButton* starBtn{ entry->bindNew<Wt::WPushButton>("star", Wt::WString::tr(isStarred() ? "Lms.Explore.unstar" : "Lms.Explore.star")) };
-            starBtn->clicked().connect([=] {
+            Wt::WPushButton* starBtn{ entry->bindNew<Wt::WPushButton>("star-btn", Wt::WString::tr(isStarred() ? "Lms.template.unstar-btn" : "Lms.template.star-btn"), Wt::TextFormat::XHTML) };
+            Wt::WPushButton* starMenuEntry{ entry->bindNew<Wt::WPushButton>("star", Wt::WString::tr(isStarred() ? "Lms.Explore.unstar" : "Lms.Explore.star")) };
+
+            auto toggle{ [=] {
                 auto transaction{ LmsApp->getDbSession().createWriteTransaction() };
 
                 if (isStarred())
                 {
                     core::Service<feedback::IFeedbackService>::get()->unstar(LmsApp->getUserId(), trackId);
-                    starBtn->setText(Wt::WString::tr("Lms.Explore.star"));
+                    starMenuEntry->setText(Wt::WString::tr("Lms.Explore.star"));
+                    starBtn->setText(Wt::WString::tr("Lms.template.star-btn"));
                 }
                 else
                 {
                     core::Service<feedback::IFeedbackService>::get()->star(LmsApp->getUserId(), trackId);
-                    starBtn->setText(Wt::WString::tr("Lms.Explore.unstar"));
+                    starMenuEntry->setText(Wt::WString::tr("Lms.Explore.unstar"));
+                    starBtn->setText(Wt::WString::tr("Lms.template.unstar-btn"));
                 }
-            });
+            } };
+
+            starMenuEntry->clicked().connect([=] { toggle(); });
+            starBtn->clicked().connect([=] { toggle(); });
         }
 
         entry->bindNew<Wt::WPushButton>("download", Wt::WString::tr("Lms.Explore.download"))