Index: HTML/Default/browsedb_list.html
===================================================================
--- HTML/Default/browsedb_list.html	(revision 3700)
+++ HTML/Default/browsedb_list.html	(working copy)
@@ -40,12 +40,20 @@
 
 <td align="right" width="13" [% IF odd %]class="odd"[% END %] [% IF not odd %]class="even"[% END %]>
 
-	<nobr><a href="[% webroot %]status_header.html?command=playlist&subcommand=loadtracks[% attributes %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/images/b_play.gif" width=13 height=13 alt="[% "PLAY" | string %]" title="[% "PLAY" | string %]"></a></nobr>
+		[% IF itemobj.isRemoteURL %]
+		<nobr><a href="[% webroot %]status_header.html?p0=playlist&p1=play&p2=[% itempath %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/images/b_play.gif" width=13 height=13 alt="[% "PLAY" | string %]" title="[% "PLAY" | string %]"></a></nobr>
+		[% ELSE %]
+		<nobr><a href="[% webroot %]status_header.html?command=playlist&subcommand=loadtracks[% attributes %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/images/b_play.gif" width=13 height=13 alt="[% "PLAY" | string %]" title="[% "PLAY" | string %]"></a></nobr>
+		[% END %]
 
 </td>
 <td align="right" width="13" [% IF odd %]class="odd"[% END %] [% IF not odd %]class="even"[% END %]>
 
-	<nobr><a href="[% webroot %]status_header.html?command=playlist&subcommand=addtracks[% attributes %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/images/b_add.gif" width=13 height=13 alt="[% "ADD_TO_PLAYLIST" | string %]" title="[% "ADD_TO_PLAYLIST" | string %]"></a></nobr>
+		[% IF itemobj.isRemoteURL %]
+		<nobr><a href="[% webroot %]status_header.html?p0=playlist&p1=add&p2=[% itempath %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/images/b_add.gif"  width=13 height=13 alt="[% "ADD_TO_PLAYLIST" | string %]" title="[% "ADD_TO_PLAYLIST" | string %]"></a></nobr>
+		[% ELSE %]
+		<nobr><a href="[% webroot %]status_header.html?command=playlist&subcommand=addtracks[% attributes %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/images/b_add.gif" width=13 height=13 alt="[% "ADD_TO_PLAYLIST" | string %]" title="[% "ADD_TO_PLAYLIST" | string %]"></a></nobr>
+		[% END %]
 
 </td>
 
Index: HTML/Fishbone/browsedb_list.html
===================================================================
--- HTML/Fishbone/browsedb_list.html	(revision 3700)
+++ HTML/Fishbone/browsedb_list.html	(working copy)
@@ -24,20 +24,32 @@
 		[% END %]
 	</td>
 	<td class="listing" width="11" align="center">
-		[% IF descend %]<nobr><a href="[% webroot %]status_header.html?command=playlist&subcommand=inserttracks[% attributes | html %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/queue.gif" border=0 align="center" width="6" height="9" alt='Queue' title='[% "ADD_TO_PLAYLIST" | string %] [% "NEXT" | string %]' onMouseOver="self.status='[% "ADD_TO_PLAYLIST" | string %] [% "NEXT" | string %]';return true"></a></nobr>[% END %]
-		[% IF not descend %]<nobr><a href="[% webroot %]status_header.html?p0=playlist&p1=insert&p2=[% itempath | uri %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/queue.gif" border=0 align="center" width="6" height="9" alt='Queue' title='[% "ADD_TO_PLAYLIST" | string %] [% "NEXT" | string %]' onMouseOver="self.status='[% "ADD_TO_PLAYLIST" | string %] [% "NEXT" | string %]';return true"></a></nobr>[% END %]
+		[% IF itemobj.isRemoteURL %]<nobr><a href="[% webroot %]status_header.html?p0=playlist&p1=insert&p2=[% itempath | uri %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/images/queue.gif" border=0 align="center" width="6" height="9" alt='Queue' title='[% "ADD_TO_PLAYLIST" | string %] [% "NEXT" | string %]' onMouseOver="self.status='[% "ADD_TO_PLAYLIST" | string %] [% "NEXT" | string %]';return true"></a></nobr>[% END %]
+		[% IF not itemobj.isRemoteURL %]<nobr><a href="[% webroot %]status_header.html?command=playlist&subcommand=inserttracks[% attributes | html %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/images/queue.gif" border=0 align="center" width="6" height="9" alt='Queue' title='[% "ADD_TO_PLAYLIST" | string %] [% "NEXT" | string %]' onMouseOver="self.status='[% "ADD_TO_PLAYLIST" | string %] [% "NEXT" | string %]';return true"></a></nobr>[% END %]
 	</td>
 	<td class="listing" width="3" align="center">&nbsp;</td>
 	<td class="listing" width="11" align="center">
-		<nobr><a href="[% webroot %]status_header.html?command=playlist&subcommand=loadtracks[% attributes | html %]&player=[% player | uri %]"  target="status"><img src="[% webroot %]html/play.this.gif" border=0 align="center" width="5" height="9"  alt='Play' title='[% "PLAY" | string %]' onMouseOver="self.status='[% "PLAY" | string %]';return true"></a></nobr>
+		[% IF itemobj.isRemoteURL %]
+		<nobr><a href="[% webroot %]status_header.html?p0=playlist&p1=play&p2=[% itempath %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/images/play.this.gif" border=0 align="center" width="8" height="8" alt='Play' title='[% "PLAY" | string %]' onMouseOver="self.status='[% "PLAY" | string %]';return true"></a></nobr>
+		[% ELSE %]
+		<nobr><a href="[% webroot %]status_header.html?command=playlist&subcommand=loadtracks[% attributes | html %]&player=[% player | uri %]"  target="status"><img src="[% webroot %]html/images/play.this.gif" border=0 align="center" width="5" height="9"  alt='Play' title='[% "PLAY" | string %]' onMouseOver="self.status='[% "PLAY" | string %]';return true"></a></nobr>
+		[% END %]
 	</td>
 	<td class="listing" width="3" align="center">&nbsp;</td>
 	<td class="listing" width="11" align="center">
-		<nobr><a href="[% webroot %]status_header.html?command=playlist&subcommand=addtracks[% attributes | html %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/add.gif" border=0 align="center" width="8" height="8" alt='Add' title='[% "ADD_TO_PLAYLIST" | string %]' onMouseOver="self.status='[% "ADD_TO_PLAYLIST" | string %]';return true"></a></nobr>
+		[% IF itemobj.isRemoteURL %]
+		<nobr><a href="[% webroot %]status_header.html?p0=playlist&p1=add&p2=[% itempath %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/images/add.gif" border=0 align="center" width="8" height="8" alt='Add' title='[% "ADD_TO_PLAYLIST" | string %]' onMouseOver="self.status='[% "ADD_TO_PLAYLIST" | string %]';return true"></a></nobr>
+		[% ELSE %]
+		<nobr><a href="[% webroot %]status_header.html?command=playlist&subcommand=addtracks[% attributes | html %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/images/add.gif" border=0 align="center" width="8" height="8" alt='Add' title='[% "ADD_TO_PLAYLIST" | string %]' onMouseOver="self.status='[% "ADD_TO_PLAYLIST" | string %]';return true"></a></nobr>
+		[% END %]
 	</td>
 	<td class="listing" width="3" align="center">&nbsp;</td>
 	<td class="listing" width="11" align="center">
-		<nobr><a href="[% webroot %]status_header.html?command=playlist&subcommand=deletetracks[% attributes | html %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/subtract.gif" border=0 align="center" width="8" height="8" alt='Delete' title='[% "REMOVE_FROM_PLAYLIST" | string %]' onMouseOver="self.status='[% "REMOVE_FROM_PLAYLIST" | string %]';return true"></a></nobr>
+		[% IF itemobj.isRemoteURL %]
+		<nobr><a href="[% webroot %]status_header.html?p0=playlist&p1=deleteitem&p2=[% itempath %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/images/subtract.gif" border=0 align="center" width="8" height="8" alt='Add' title='[% "ADD_TO_PLAYLIST" | string %]' onMouseOver="self.status='[% "ADD_TO_PLAYLIST" | string %]';return true"></a></nobr>
+		[% ELSE %]
+		<nobr><a href="[% webroot %]status_header.html?command=playlist&subcommand=deletetracks[% attributes | html %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/images/subtract.gif" border=0 align="center" width="8" height="8" alt='Delete' title='[% "REMOVE_FROM_PLAYLIST" | string %]' onMouseOver="self.status='[% "REMOVE_FROM_PLAYLIST" | string %]';return true"></a></nobr>
+		[% END %]
 	</td>
 	[% FOREACH mixer = mixerlinks.values.sort %]
 		[% PROCESS $mixer %]
Index: HTML/EN/browsedb_list.html
===================================================================
--- HTML/EN/browsedb_list.html	(revision 3700)
+++ HTML/EN/browsedb_list.html	(working copy)
@@ -33,24 +33,23 @@
 </td>
 <td [% IF odd %]class="odd" bgcolor="#d0d0d0"[% END %] [% IF not odd %]class="even" bgcolor="#FFFFFF"[% END %]>
 
-[% IF descend %]
-	<nobr><a href="[% webroot %]status.html?command=playlist&subcommand=loadtracks[% attributes %]&player=[% player | uri %]" target="status">[% "PLAY" | string %]</a></nobr>
+[% IF itemobj.isRemoteURL %]
+	<nobr><a href="[% webroot %]status.html?p0=playlist&p1=play&p2=[% itempath | uri %]&player=[% player | uri %]" target="status">[% "PLAY" | string %]</a></nobr>
 
 [% ELSE %]
-	<nobr><a href="[% webroot %]status.html?p0=playlist&p1=play&p2=[% itempath | uri %]&player=[% player | uri %]" target="status">[% "PLAY" | string %]</a></nobr>
+	<nobr><a href="[% webroot %]status.html?command=playlist&subcommand=loadtracks[% attributes %]&player=[% player | uri %]" target="status">[% "PLAY" | string %]</a></nobr>
+
 [% END %]
 
 </td>
 <td [% IF odd %]class="odd" bgcolor="#d0d0d0"[% END %] [% IF not odd %]class="even" bgcolor="#FFFFFF"[% END %]>
 
-[% IF descend %]
+[% IF itemobj.isRemoteURL %]
+	<nobr><a href="[% webroot %]status.html?p0=playlist&p1=append&p2=[% itempath | uri %]&player=[% player | uri %]" target="status">[% FILTER nbsp %][% "ADD_TO_PLAYLIST" | string %][% END %]</a></nobr>
 
+[% ELSE %]
 	<nobr><a href="[% webroot %]status.html?command=playlist&subcommand=addtracks[% attributes %]&player=[% player | uri %]" target="status">[% FILTER nbsp %][% "ADD_TO_PLAYLIST" | string %][% END %]</a></nobr>
 
-[% ELSE %]
-
-	<nobr><a href="[% webroot %]status.html?p0=playlist&p1=append&p2=[% itempath | uri %]&player=[% player | uri %]" target="status">[% FILTER nbsp %][% "ADD_TO_PLAYLIST" | string %][% END %]</a></nobr>
-
 [% END %]
 
 </td>
Index: HTML/Handheld/browsedb_list.html
===================================================================
--- HTML/Handheld/browsedb_list.html	(revision 3700)
+++ HTML/Handheld/browsedb_list.html	(working copy)
@@ -26,12 +26,20 @@
 			[% END %]
 		</td>
 		<td width="13">
+		[% IF itemobj.isRemoteURL %]
+			<a href="status.html?p0=playlist&p1=play&p2=[% itempath %]&player=[% player | uri %]"><img src="html/images/b_play.gif" border=0 align="center" width="13" height="13"></a>
+		[% ELSE %]
 			<a href="status.html?command=playlist&subcommand=loadtracks[% attributes %]&player=[% player | uri %]"><img src="html/images/b_play.gif" border=0 align="center" width="13" height="13"></a>
+		[% END %]
 		</td>
 		<td>&nbsp;</td>
 		
 		<td width="13">
+		[% IF itemobj.isRemoteURL %]
+			<a href="status.html?p0=playlist&p1=add&p2=[% itempath %]&player=[% player | uri %]"><img src="html/images/b_add.gif" border=0 align="center" width="13" height="13"></a>
+		[% ELSE %]
 			<a href="status.html?command=playlist&subcommand=addtracks[% attributes %]&player=[% player | uri %]"><img src="html/images/b_add.gif" border=0 align="center" width="13" height="13"></a>
+		[% END %]
 		</td>
 		[% FOREACH mixer = mixerlinks.values.sort %]
 			[% PROCESS $mixer %]