diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/ShuffleButtonSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/ShuffleButtonSongAdapter.kt
index 801fd1ab..2714447b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/ShuffleButtonSongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/ShuffleButtonSongAdapter.kt
@@ -1,16 +1,12 @@
 package code.name.monkey.retromusic.adapter.song
 
 import android.view.View
-import android.widget.PopupMenu
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.AppCompatImageView
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.SortOrder.SongSortOrder
 import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.PreferenceUtil
-import com.google.android.material.textview.MaterialTextView
+import com.google.android.material.button.MaterialButton
 
 class ShuffleButtonSongAdapter(
     activity: AppCompatActivity,
@@ -32,77 +28,14 @@ class ShuffleButtonSongAdapter(
             viewHolder.shuffleAction?.setOnClickListener {
                 MusicPlayerRemote.openAndShuffleQueue(dataSet, true)
             }
-            val songCount = activity.resources.getQuantityString(R.plurals.songCount, dataSet.size, dataSet.size)
-            viewHolder.songCount?.text = songCount
-            viewHolder.sortAction?.setOnClickListener {
-                showSortPopupMenu(it)
-            }
         } else {
             super.onBindViewHolder(holder, position - 1)
         }
     }
 
-    private fun showGridPopupMenu(view: View) {
-        val popupMenu = PopupMenu(activity, view)
-        popupMenu.menuInflater.inflate(R.menu.menu_grid_options, popupMenu.menu)
-        popupMenu.setOnMenuItemClickListener {
-            when (it.itemId) {
-                R.id.action_grid_size_1 -> {
-                    PreferenceUtil.getInstance(activity).setSongGridSize(1)
-                }
-                R.id.action_grid_size_2 -> {
-                    PreferenceUtil.getInstance(activity).setSongGridSize(2)
-                }
-                R.id.action_grid_size_3 -> {
-                    PreferenceUtil.getInstance(activity).setSongGridSize(3)
-                }
-                R.id.action_grid_size_4 -> {
-                    PreferenceUtil.getInstance(activity).setSongGridSize(4)
-                }
-
-            }
-            return@setOnMenuItemClickListener true
-        }
-        popupMenu.show()
-    }
-
-    private fun showSortPopupMenu(view: View) {
-        val popupMenu = PopupMenu(activity, view)
-        popupMenu.menuInflater.inflate(R.menu.menu_song_sort, popupMenu.menu)
-        popupMenu.setOnMenuItemClickListener {
-            when (it.itemId) {
-                R.id.action_song_sort_order_asc -> {
-                    PreferenceUtil.getInstance(activity).songSortOrder = SongSortOrder.SONG_A_Z
-                }
-                R.id.action_song_sort_order_desc -> {
-                    PreferenceUtil.getInstance(activity).songSortOrder = SongSortOrder.SONG_Z_A
-                }
-                R.id.action_song_sort_order_artist -> {
-                    PreferenceUtil.getInstance(activity).songSortOrder = SongSortOrder.SONG_ARTIST
-                }
-                R.id.action_song_sort_order_album -> {
-                    PreferenceUtil.getInstance(activity).songSortOrder = SongSortOrder.SONG_ALBUM
-                }
-                R.id.action_song_sort_order_date -> {
-                    PreferenceUtil.getInstance(activity).songSortOrder = SongSortOrder.SONG_DATE
-                }
-                R.id.action_song_sort_order_composer -> {
-                    PreferenceUtil.getInstance(activity).songSortOrder = SongSortOrder.COMPOSER
-                }
-                R.id.action_song_sort_order_year -> {
-                    PreferenceUtil.getInstance(activity).songSortOrder = SongSortOrder.SONG_YEAR
-                }
-            }
-            return@setOnMenuItemClickListener true
-        }
-        popupMenu.show()
-    }
-
     inner class ViewHolder(itemView: View) : AbsOffsetSongAdapter.ViewHolder(itemView) {
-        val playAction: AppCompatImageView? = itemView.findViewById(R.id.playAction)
-        val shuffleAction: AppCompatImageView? = itemView.findViewById(R.id.shuffleAction)
-        val sortAction: AppCompatImageView? = itemView.findViewById(R.id.sortAction)
-        val songCount: MaterialTextView? = itemView.findViewById(R.id.songCount)
+        val playAction: MaterialButton? = itemView.findViewById(R.id.playAction)
+        val shuffleAction: MaterialButton? = itemView.findViewById(R.id.shuffleAction)
 
         override fun onClick(v: View?) {
             if (itemViewType == OFFSET_ITEM) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/SongsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/SongsFragment.kt
index b2ceea28..66529505 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/SongsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/SongsFragment.kt
@@ -1,7 +1,5 @@
 package code.name.monkey.retromusic.fragments.mainactivity
 
-import android.content.SharedPreferences
-import android.content.SharedPreferences.OnSharedPreferenceChangeListener
 import android.os.Bundle
 import android.view.View
 import androidx.annotation.LayoutRes
@@ -20,7 +18,7 @@ import java.util.ArrayList
 import javax.inject.Inject
 
 class SongsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<SongAdapter, LinearLayoutManager>(),
-    SongView, MainActivityFragmentCallbacks, OnSharedPreferenceChangeListener {
+    SongView, MainActivityFragmentCallbacks {
 
     @Inject
     lateinit var songPresenter: SongPresenter
@@ -84,13 +82,11 @@ class SongsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<SongAdap
         super.onResume()
         if (adapter?.dataSet.isNullOrEmpty())
             songPresenter.loadSongs()
-        PreferenceUtil.getInstance(requireContext()).registerOnSharedPreferenceChangedListener(this)
     }
 
     override fun onDestroyView() {
         super.onDestroyView()
         songPresenter.detachView()
-        PreferenceUtil.getInstance(requireContext()).unregisterOnSharedPreferenceChangedListener(this)
     }
 
     override fun showEmptyView() {
@@ -137,10 +133,4 @@ class SongsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<SongAdap
     override fun handleBackPress(): Boolean {
         return false
     }
-
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
-        if (key == PreferenceUtil.SONG_SORT_ORDER || key == PreferenceUtil.SONG_GRID_SIZE) {
-            songPresenter.loadSongs()
-        }
-    }
 }
diff --git a/app/src/main/res/drawable/popup_background.xml b/app/src/main/res/drawable/popup_background.xml
deleted file mode 100644
index 2d73eda9..00000000
--- a/app/src/main/res/drawable/popup_background.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
-  ~
-  ~ Licensed under the GNU General Public License v3
-  ~
-  ~ This 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.
-  ~
-  ~ This software 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.
-  -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="16dp" />
-    <solid android:color="?attr/colorSurface" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_list_quick_actions.xml b/app/src/main/res/layout/item_list_quick_actions.xml
index 4e67689a..c90ac8a2 100644
--- a/app/src/main/res/layout/item_list_quick_actions.xml
+++ b/app/src/main/res/layout/item_list_quick_actions.xml
@@ -14,44 +14,33 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:paddingStart="16dp"
-    android:paddingEnd="0dp">
+    android:paddingStart="8dp"
+    android:paddingEnd="8dp">
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songCount"
-        android:layout_width="match_parent"
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/playAction"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp"
         android:layout_weight="1"
-        android:textAppearance="@style/TextViewSubtitle1"
-        android:textStyle="bold" />
+        android:text="@string/action_play_all"
+        app:backgroundTint="?attr/colorSurface"
+        app:icon="@drawable/ic_play_arrow_white_24dp" />
 
-
-    <androidx.appcompat.widget.AppCompatImageView
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/shuffleAction"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_weight="0"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        app:srcCompat="@drawable/ic_shuffle_white_24dp"
-        app:tint="?attr/colorControlNormal"
-        tools:tint="@color/black_color" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/sortAction"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="0"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        app:srcCompat="@drawable/ic_sort_white_24dp"
-        app:tint="?attr/colorControlNormal"
-        tools:tint="@color/black_color" />
-
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp"
+        android:layout_weight="1"
+        android:text="@string/shuffle"
+        app:backgroundTint="?attr/colorSurface"
+        app:icon="@drawable/ic_shuffle_white_24dp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_grid_options.xml b/app/src/main/res/menu/menu_grid_options.xml
deleted file mode 100644
index 156927e6..00000000
--- a/app/src/main/res/menu/menu_grid_options.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
-  ~
-  ~ Licensed under the GNU General Public License v3
-  ~
-  ~ This 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.
-  ~
-  ~ This software 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.
-  -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/action_grid_size_1"
-        android:title="@string/grid_size_1" />
-    <item
-        android:id="@+id/action_grid_size_2"
-        android:title="@string/grid_size_2" />
-    <item
-        android:id="@+id/action_grid_size_3"
-        android:title="@string/grid_size_3" />
-    <item
-        android:id="@+id/action_grid_size_4"
-        android:title="@string/grid_size_4" />
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_song_sort.xml b/app/src/main/res/menu/menu_song_sort.xml
deleted file mode 100644
index b6126f42..00000000
--- a/app/src/main/res/menu/menu_song_sort.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
-  ~
-  ~ Licensed under the GNU General Public License v3
-  ~
-  ~ This 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.
-  ~
-  ~ This software 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.
-  -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/action_song_sort_order_asc"
-        android:title="@string/sort_order_a_z" />
-    <item
-        android:id="@+id/action_song_sort_order_desc"
-        android:title="@string/sort_order_z_a" />
-    <item
-        android:id="@+id/action_song_sort_order_artist"
-        android:title="@string/sort_order_artist" />
-    <item
-        android:id="@+id/action_song_sort_order_album"
-        android:title="@string/sort_order_album" />
-    <item
-        android:id="@+id/action_song_sort_order_date"
-        android:title="@string/sort_order_date" />
-    <item
-        android:id="@+id/action_song_sort_order_year"
-        android:title="@string/sort_order_year" />
-    <item
-        android:id="@+id/action_song_sort_order_composer"
-        android:title="@string/sort_order_composer" />
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-night-v27/styles.xml b/app/src/main/res/values-night-v27/styles.xml
index accac239..ba94dab7 100644
--- a/app/src/main/res/values-night-v27/styles.xml
+++ b/app/src/main/res/values-night-v27/styles.xml
@@ -34,7 +34,6 @@
         <item name="android:windowLightNavigationBar">false</item>
         <!--Manual setting colors-->
         <item name="colorSurface">@color/darkColorSurface</item>
-        <item name="popupMenuStyle">@style/RetroPopupTheme</item>
-        <item name="android:popupMenuStyle">@style/RetroPopupTheme</item>
+
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 0f585cd0..e53f21ee 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -34,6 +34,5 @@
         <!--Manual setting colors-->
         <item name="colorPrimary">@color/darkColorPrimary</item>
         <item name="colorSurface">@color/darkColorSurface</item>
-        <item name="popupMenuStyle">@style/RetroPopupTheme</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v27/styles_parents.xml b/app/src/main/res/values-v27/styles_parents.xml
index 95975838..bb5dd329 100644
--- a/app/src/main/res/values-v27/styles_parents.xml
+++ b/app/src/main/res/values-v27/styles_parents.xml
@@ -31,8 +31,7 @@
         <item name="rectSelector">@drawable/rect_selector</item>
         <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
         <item name="android:windowLightNavigationBar">true</item>
-        <item name="popupMenuStyle">@style/RetroPopupTheme</item>
-        <item name="android:popupMenuStyle">@style/RetroPopupTheme</item>
+
     </style>
 
     <style name="Theme.RetroMusic.Base" parent="Theme.MaterialComponents.NoActionBar">
@@ -57,8 +56,7 @@
         <item name="android:windowLightNavigationBar">false</item>
         <!--Manual setting colors-->
         <item name="colorSurface">@color/darkColorSurface</item>
-        <item name="popupMenuStyle">@style/RetroPopupTheme</item>
-        <item name="android:popupMenuStyle">@style/RetroPopupTheme</item>
+
     </style>
 
     <style name="Theme.RetroMusic.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
@@ -80,7 +78,6 @@
         <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
         <item name="android:windowLightNavigationBar">false</item>
-        <item name="popupMenuStyle">@style/RetroPopupTheme</item>
-        <item name="android:popupMenuStyle">@style/RetroPopupTheme</item>
+
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b26236b0..3b09e0dd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -827,8 +827,4 @@
     <string name="retro_music_player">Retro Music Player</string>
     <string name="pro">Pro</string>
     <string name="free">Free</string>
-    <plurals name="songCount">
-        <item quantity="one">%d Song</item>
-        <item quantity="other">%d Songs</item>
-    </plurals>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0976e75a..6a4338d2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -183,9 +183,4 @@
         <item name="android:windowBackground">@drawable/splash</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
     </style>
-
-    <style name="RetroPopupTheme">
-        <item name="android:popupBackground">@drawable/popup_background</item>
-        <item name="android:popupElevation">4dp</item>
-    </style>
 </resources>
diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml
index 0b9290a7..a4ffc86f 100644
--- a/app/src/main/res/values/styles_parents.xml
+++ b/app/src/main/res/values/styles_parents.xml
@@ -17,8 +17,7 @@
         <item name="roundSelector">@drawable/round_selector</item>
         <item name="rectSelector">@drawable/rect_selector</item>
         <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
-        <item name="popupMenuStyle">@style/RetroPopupTheme</item>
-        <item name="android:popupMenuStyle">@style/RetroPopupTheme</item>
+
     </style>
 
     <style name="Theme.RetroMusic.Base" parent="Theme.MaterialComponents.NoActionBar">
@@ -43,8 +42,7 @@
 
         <!--Manual setting colors-->
         <item name="colorSurface">@color/darkColorSurface</item>
-        <item name="popupMenuStyle">@style/RetroPopupTheme</item>
-        <item name="android:popupMenuStyle">@style/RetroPopupTheme</item>
+
     </style>
 
     <style name="Theme.RetroMusic.Base.Black" parent="Theme.MaterialComponents.NoActionBar">
@@ -65,8 +63,7 @@
         <item name="colorOnBackground">@color/blackColorSurface</item>
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="mcab_popup_theme">@style/ThemeOverlay.AppCompat.Dark</item>
-        <item name="popupMenuStyle">@style/RetroPopupTheme</item>
-        <item name="android:popupMenuStyle">@style/RetroPopupTheme</item>
+
     </style>
 
     <style name="Theme.RetroMusic.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
@@ -87,8 +84,7 @@
         <item name="windowActionBar">false</item>
         <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
-        <item name="popupMenuStyle">@style/RetroPopupTheme</item>
-        <item name="android:popupMenuStyle">@style/RetroPopupTheme</item>
+
     </style>