diff --git a/res/drawable-hdpi/ic_media_next.png b/res/drawable-hdpi/ic_media_next.png
new file mode 100644
index 0000000..6e27b81
Binary files /dev/null and b/res/drawable-hdpi/ic_media_next.png differ
diff --git a/res/drawable-hdpi/ic_media_pause.png b/res/drawable-hdpi/ic_media_pause.png
new file mode 100644
index 0000000..1d465a4
Binary files /dev/null and b/res/drawable-hdpi/ic_media_pause.png differ
diff --git a/res/drawable-hdpi/ic_media_play.png b/res/drawable-hdpi/ic_media_play.png
new file mode 100644
index 0000000..2746d17
Binary files /dev/null and b/res/drawable-hdpi/ic_media_play.png differ
diff --git a/res/drawable-hdpi/ic_media_previous.png b/res/drawable-hdpi/ic_media_previous.png
new file mode 100644
index 0000000..85b3766
Binary files /dev/null and b/res/drawable-hdpi/ic_media_previous.png differ
diff --git a/res/drawable-mdpi/ic_media_next.png b/res/drawable-mdpi/ic_media_next.png
new file mode 100644
index 0000000..fcd73d9
Binary files /dev/null and b/res/drawable-mdpi/ic_media_next.png differ
diff --git a/res/drawable-mdpi/ic_media_pause.png b/res/drawable-mdpi/ic_media_pause.png
new file mode 100644
index 0000000..3e6b2a1
Binary files /dev/null and b/res/drawable-mdpi/ic_media_pause.png differ
diff --git a/res/drawable-mdpi/ic_media_play.png b/res/drawable-mdpi/ic_media_play.png
new file mode 100644
index 0000000..7966bbc
Binary files /dev/null and b/res/drawable-mdpi/ic_media_play.png differ
diff --git a/res/drawable-mdpi/ic_media_previous.png b/res/drawable-mdpi/ic_media_previous.png
new file mode 100644
index 0000000..b653d05
Binary files /dev/null and b/res/drawable-mdpi/ic_media_previous.png differ
diff --git a/res/drawable-xhdpi/ic_media_next.png b/res/drawable-xhdpi/ic_media_next.png
new file mode 100644
index 0000000..4def965
Binary files /dev/null and b/res/drawable-xhdpi/ic_media_next.png differ
diff --git a/res/drawable-xhdpi/ic_media_pause.png b/res/drawable-xhdpi/ic_media_pause.png
new file mode 100644
index 0000000..6bd3d48
Binary files /dev/null and b/res/drawable-xhdpi/ic_media_pause.png differ
diff --git a/res/drawable-xhdpi/ic_media_play.png b/res/drawable-xhdpi/ic_media_play.png
new file mode 100644
index 0000000..ccfef18
Binary files /dev/null and b/res/drawable-xhdpi/ic_media_play.png differ
diff --git a/res/drawable-xhdpi/ic_media_previous.png b/res/drawable-xhdpi/ic_media_previous.png
new file mode 100644
index 0000000..c4472ae
Binary files /dev/null and b/res/drawable-xhdpi/ic_media_previous.png differ
diff --git a/res/layout/renderer_fragment.xml b/res/layout/renderer_fragment.xml
index 9402d01..e47a882 100644
--- a/res/layout/renderer_fragment.xml
+++ b/res/layout/renderer_fragment.xml
@@ -26,24 +26,26 @@
 	
 	    <LinearLayout
 	        android:layout_width="match_parent"
-	        android:layout_height="wrap_content" >
+	        android:layout_height="wrap_content"
+    		android:gravity="center" >
 	        
-		    <Button
+		    <ImageButton
 		        android:id="@+id/previous"
 		        android:layout_width="wrap_content"
 		        android:layout_height="wrap_content"
-		        android:text="@string/previous" />
+		        android:contentDescription="@string/previous" />
 	        
-		    <Button
+		    <ImageButton
 		        android:id="@+id/playpause"
 		        android:layout_width="wrap_content"
-		        android:layout_height="wrap_content" />
+		        android:layout_height="wrap_content"
+		        android:contentDescription="@string/play" />
 	        
-		    <Button
+		    <ImageButton
 		        android:id="@+id/next"
 		        android:layout_width="wrap_content"
 		        android:layout_height="wrap_content" 
-		        android:text="@string/next" />
+		        android:contentDescription="@string/next" />
 		    
 	    </LinearLayout>
 	    
diff --git a/src/com/github/nutomic/controldlna/RendererFragment.java b/src/com/github/nutomic/controldlna/RendererFragment.java
index 63f9e3b..16c9089 100644
--- a/src/com/github/nutomic/controldlna/RendererFragment.java
+++ b/src/com/github/nutomic/controldlna/RendererFragment.java
@@ -72,7 +72,7 @@ import android.widget.AbsListView;
 import android.widget.AbsListView.OnScrollListener;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
-import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.ListView;
 import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
@@ -98,7 +98,7 @@ public class RendererFragment extends Fragment implements
 	
 	private View mControls;
 	private SeekBar mProgressBar;
-	private Button mPlayPause;
+	private ImageButton mPlayPause;
 	
 	private boolean mPlaying = false;
 	
@@ -174,9 +174,13 @@ public class RendererFragment extends Fragment implements
         mControls = getView().findViewById(R.id.controls);
         mProgressBar = (SeekBar) getView().findViewById(R.id.progressBar);
         mProgressBar.setOnSeekBarChangeListener(this);
-        mPlayPause = (Button) getView().findViewById(R.id.playpause);
+        ImageButton previous = (ImageButton) getView().findViewById(R.id.previous);
+        previous.setImageResource(R.drawable.ic_media_previous);
+        ImageButton next = (ImageButton) getView().findViewById(R.id.next);
+        next.setImageResource(R.drawable.ic_media_next);
+        mPlayPause = (ImageButton) getView().findViewById(R.id.playpause);
         mPlayPause.setOnClickListener(this);
-    	mPlayPause.setText(R.string.play);
+    	mPlayPause.setImageResource(R.drawable.ic_media_play);
     	getView().findViewById(R.id.previous).setOnClickListener(this);
     	getView().findViewById(R.id.next).setOnClickListener(this);
 
@@ -328,7 +332,9 @@ public class RendererFragment extends Fragment implements
 										AVTransportVariable.TransportState.class)
 												.getValue()) {
 								case PLAYING:
-							    	mPlayPause.setText(R.string.pause);
+							    	mPlayPause.setImageResource(R.drawable.ic_media_pause);
+							    	mPlayPause.setContentDescription(getResources().
+							    			getString(R.string.pause));
 									mPlaying = true;
 									pollTimePosition();
 									enableTrackHighlight();
@@ -336,7 +342,9 @@ public class RendererFragment extends Fragment implements
 								case STOPPED:
 									// fallthrough
 								case PAUSED_PLAYBACK:
-							    	mPlayPause.setText(R.string.play);
+							    	mPlayPause.setImageResource(R.drawable.ic_media_play);
+							    	mPlayPause.setContentDescription(getResources().
+							    			getString(R.string.play));
 									mPlaying = false;	
 							    	break;
 								default:
diff --git a/src/com/github/nutomic/controldlna/service/PlayService.java b/src/com/github/nutomic/controldlna/service/PlayService.java
index 2d3c616..71b69f3 100644
--- a/src/com/github/nutomic/controldlna/service/PlayService.java
+++ b/src/com/github/nutomic/controldlna/service/PlayService.java
@@ -226,6 +226,9 @@ public class PlayService extends Service {
 	 * Sends 'play' signal to current renderer.
 	 */
 	public void play() {
+		if (mPlaylist.size() == 0) 
+			return;
+		
 		updateNotification();
 		mUpnpService.getControlPoint().execute(
 				new Play(mAvTransportService) {