diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt
index 7f50a870..a1c3ee81 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt
@@ -536,8 +536,10 @@ class PlayerFragment :
                 if (update.success == true && update.rating is HeartRating) {
                     if (update.rating.isHeart) {
                         starMenuItem.setIcon(fullStar)
+                        starMenuItem.setTitle(R.string.download_menu_unstar)
                     } else {
                         starMenuItem.setIcon(hollowStar)
+                        starMenuItem.setTitle(R.string.download_menu_star)
                     }
                 } else if (update.success == false) {
                     Toast.makeText(context, "Setting rating failed", Toast.LENGTH_SHORT)
diff --git a/ultrasonic/src/main/res/menu/nowplaying.xml b/ultrasonic/src/main/res/menu/nowplaying.xml
index 39126689..d3bc8b59 100644
--- a/ultrasonic/src/main/res/menu/nowplaying.xml
+++ b/ultrasonic/src/main/res/menu/nowplaying.xml
@@ -12,7 +12,7 @@
     <item
         a:id="@+id/menu_item_star"
         a:icon="@drawable/ic_star_hollow"
-        app:showAsAction="ifRoom|withText"
+        app:showAsAction="always"
         a:title="@string/download.menu_star"/>
 
     <item
diff --git a/ultrasonic/src/main/res/menu/search_view_menu.xml b/ultrasonic/src/main/res/menu/search_view_menu.xml
index 9b39a8b2..c3ca8876 100644
--- a/ultrasonic/src/main/res/menu/search_view_menu.xml
+++ b/ultrasonic/src/main/res/menu/search_view_menu.xml
@@ -7,6 +7,6 @@
         a:icon="@drawable/ic_menu_search"
         a:title="@string/button_bar.search"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
-        app:showAsAction="always|collapseActionView" />
+        app:showAsAction="ifRoom|collapseActionView" />
 
 </menu>
\ No newline at end of file
diff --git a/ultrasonic/src/main/res/values/strings.xml b/ultrasonic/src/main/res/values/strings.xml
index f8d91b62..08db0901 100644
--- a/ultrasonic/src/main/res/values/strings.xml
+++ b/ultrasonic/src/main/res/values/strings.xml
@@ -346,6 +346,7 @@
     <string name="download.bookmark_set">Set Bookmark</string>
     <string name="download.bookmark_delete">Delete Bookmark</string>
     <string name="download.menu_star">Star</string>
+    <string name="download.menu_unstar">Unstar</string>
     <string name="download.menu_clear_playlist">Clear Playlist</string>
     <string name="button_bar.shares">Shares</string>
     <string name="select_share.empty">No shares available on server</string>