diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapter.java
index 2ac7a392..33e2ee2f 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapter.java
@@ -46,12 +46,16 @@ public class PlayingQueueAdapter extends ArrayAdapter<Song> {
 
         title.setText(song.title);
         if (MusicPlayerRemote.getPosition() == position) {
+            int iconPadding = activity.getResources().getDimensionPixelSize(R.dimen.list_item_image_icon_padding);
+            playingIndicator.setPadding(iconPadding, iconPadding, iconPadding, iconPadding);
+            playingIndicator.setImageDrawable(Util.getTintedDrawable(getContext(), R.drawable.ic_volume_up_white_24dp, DialogUtils.resolveColor(getContext(), R.attr.themed_drawable_color)));
             playingIndicator.setVisibility(View.VISIBLE);
-            playingIndicator.setImageDrawable(Util.getTintedDrawable(getContext(), R.drawable.ic_speaker_white_48dp, DialogUtils.resolveColor(getContext(), R.attr.themed_drawable_color)));
         } else {
             playingIndicator.setVisibility(View.GONE);
         }
 
+        convertView.findViewById(R.id.short_separator).setVisibility(View.GONE);
+
         overflowButton.setOnClickListener(new SongMenuHelper.OnClickSongMenu(activity) {
             @Override
             public Song getSong() {
diff --git a/app/src/main/res/drawable-hdpi/ic_speaker_white_48dp.png b/app/src/main/res/drawable-hdpi/ic_speaker_white_48dp.png
deleted file mode 100644
index 006d4939..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_speaker_white_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_volume_up_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_volume_up_white_24dp.png
new file mode 100644
index 00000000..d51ec451
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_volume_up_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_speaker_white_48dp.png b/app/src/main/res/drawable-mdpi/ic_speaker_white_48dp.png
deleted file mode 100644
index 5466f071..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_speaker_white_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_volume_up_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_volume_up_white_24dp.png
new file mode 100644
index 00000000..49dc0b86
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_volume_up_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_speaker_white_48dp.png b/app/src/main/res/drawable-xhdpi/ic_speaker_white_48dp.png
deleted file mode 100644
index 886301c6..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_speaker_white_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_volume_up_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_volume_up_white_24dp.png
new file mode 100644
index 00000000..2b9d72d3
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_volume_up_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_speaker_white_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_speaker_white_48dp.png
deleted file mode 100644
index 0ffad667..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_speaker_white_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_volume_up_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_volume_up_white_24dp.png
new file mode 100644
index 00000000..58fc6772
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_volume_up_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_speaker_white_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_speaker_white_48dp.png
deleted file mode 100755
index 43942e12..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_speaker_white_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_volume_up_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_volume_up_white_24dp.png
new file mode 100644
index 00000000..90112928
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_volume_up_white_24dp.png differ