Index: sources/rb-playlist-source.c
===================================================================
RCS file: /cvs/gnome/rhythmbox/sources/rb-playlist-source.c,v
retrieving revision 1.112
diff -u -r1.112 rb-playlist-source.c
--- sources/rb-playlist-source.c	22 Feb 2006 13:06:02 -0000	1.112
+++ sources/rb-playlist-source.c	9 Apr 2006 01:12:11 -0000
@@ -233,11 +233,18 @@
 	rb_playlist_source_set_query_model (source, rhythmdb_query_model_new_empty (source->priv->db));
 
 	{
-		const char *title = _("Trac_k");
+		const char *title = _("");
 		const char *strings[3] = {0};
 
 		GtkTreeViewColumn *column = gtk_tree_view_column_new ();
 		GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
+
+		g_object_set(renderer,
+			     "style", PANGO_STYLE_OBLIQUE,
+			     "cell-background", "Lightgray",
+			     "xalign", 1.0,
+			     NULL);
+
 		gtk_tree_view_column_pack_start (column, renderer, TRUE);
 
 		gtk_tree_view_column_set_resizable (column, TRUE);
@@ -251,10 +258,10 @@
 							 (GtkTreeCellDataFunc)
 							 rb_playlist_source_track_cell_data_func,
 							 source, NULL);
-		rb_entry_view_append_column_custom (source->priv->songs, column, title,
-						    "PlaylistTrack", NULL, 0);
+		rb_entry_view_insert_column_custom (source->priv->songs, column, title,
+						    "PlaylistTrack", NULL, 0, 0);
 	}
-
+	rb_entry_view_append_column (source->priv->songs, RB_ENTRY_VIEW_COL_TRACK_NUMBER, TRUE);
 	rb_entry_view_append_column (source->priv->songs, RB_ENTRY_VIEW_COL_TITLE, TRUE);
 	rb_entry_view_append_column (source->priv->songs, RB_ENTRY_VIEW_COL_GENRE, FALSE);
 	rb_entry_view_append_column (source->priv->songs, RB_ENTRY_VIEW_COL_ARTIST, FALSE);
Index: widgets/rb-entry-view.c
===================================================================
RCS file: /cvs/gnome/rhythmbox/widgets/rb-entry-view.c,v
retrieving revision 1.138
diff -u -r1.138 rb-entry-view.c
--- widgets/rb-entry-view.c	8 Apr 2006 07:47:14 -0000	1.138
+++ widgets/rb-entry-view.c	9 Apr 2006 01:12:13 -0000
@@ -137,6 +137,7 @@
 	gboolean is_drag_source;
 	gboolean is_drag_dest;
 
+	GdkPixbuf *playing_col_pixbuf;
 	GdkPixbuf *playing_pixbuf;
 	GdkPixbuf *paused_pixbuf;
 	GdkPixbuf *error_pixbuf;
@@ -365,13 +366,19 @@
 
 	icon_theme = gtk_icon_theme_get_default ();
 
-	view->priv->playing_pixbuf = gtk_icon_theme_load_icon (icon_theme,
+	view->priv->playing_col_pixbuf = gtk_icon_theme_load_icon (icon_theme,
                                    			       "stock_volume-max", 
                                    			       16,
                                    			       0, 
                                    			       NULL);
+
+	view->priv->playing_pixbuf = gtk_icon_theme_load_icon (icon_theme,
+                                   			       "stock_media-play", 
+                                   			       16,
+                                   			       0, 
+                                   			       NULL);
 	view->priv->paused_pixbuf = gtk_icon_theme_load_icon (icon_theme,
-                                   			      "stock_volume-0", 
+                                   			      "stock_media-pause", 
                                    			      16,
                                    			      0, 
                                    			      NULL);
@@ -409,6 +416,8 @@
 
 	if (view->priv->playing_pixbuf)
 		g_object_unref (G_OBJECT (view->priv->playing_pixbuf));
+	if (view->priv->playing_col_pixbuf)
+		g_object_unref (G_OBJECT (view->priv->playing_col_pixbuf));
 	if (view->priv->paused_pixbuf)
 		g_object_unref (G_OBJECT (view->priv->paused_pixbuf));
 	if (view->priv->error_pixbuf)
@@ -1149,6 +1158,18 @@
 				    GCompareDataFunc sort_func,
 				    RhythmDBPropType sort_prop_id)
 {
+	rb_entry_view_insert_column_custom (view, column, title, key, sort_func, sort_prop_id, -1);
+}
+
+void
+rb_entry_view_insert_column_custom (RBEntryView *view,
+				    GtkTreeViewColumn *column,
+				    const char *title,
+				    const char *key,
+				    GCompareDataFunc sort_func,
+				    RhythmDBPropType sort_prop_id,
+				    gint position)
+{
 	struct RBEntryViewColumnSortData *sortdata;
 
 	gtk_tree_view_column_set_title (column, title);
@@ -1163,7 +1184,7 @@
 
 	rb_debug ("appending column: %p (%s)", column, title);
 
-	gtk_tree_view_append_column (GTK_TREE_VIEW (view->priv->treeview), column);
+	gtk_tree_view_insert_column (GTK_TREE_VIEW (view->priv->treeview), column, position);
 
 	if (sort_func != NULL) {
 		sortdata = g_new (struct RBEntryViewColumnSortData, 1);
@@ -1177,6 +1198,7 @@
 	rb_entry_view_sync_sorting (view);
 }
 
+
 void
 rb_entry_view_set_columns_clickable (RBEntryView *view, gboolean clickable)
 {
@@ -1270,7 +1292,7 @@
 							 view,
 							 NULL);
 
-		image_widget = gtk_image_new_from_pixbuf (view->priv->playing_pixbuf);
+		image_widget = gtk_image_new_from_pixbuf (view->priv->playing_col_pixbuf);
 		g_object_ref (G_OBJECT (image_widget));
 		gtk_object_sink (GTK_OBJECT (image_widget));
 		gtk_tree_view_column_set_widget (column, image_widget);
Index: widgets/rb-entry-view.h
===================================================================
RCS file: /cvs/gnome/rhythmbox/widgets/rb-entry-view.h,v
retrieving revision 1.34
diff -u -r1.34 rb-entry-view.h
--- widgets/rb-entry-view.h	8 Apr 2006 07:47:14 -0000	1.34
+++ widgets/rb-entry-view.h	9 Apr 2006 01:12:13 -0000
@@ -110,6 +110,13 @@
 							 GCompareDataFunc sort_func,
 							 RhythmDBPropType sort_propid);
 
+void		rb_entry_view_insert_column_custom	(RBEntryView *view, GtkTreeViewColumn *column,
+							 const char *title, const char *key,
+							 GCompareDataFunc sort_func,
+							 RhythmDBPropType sort_propid,
+							 gint position);
+
+
 void		rb_entry_view_set_columns_clickable	(RBEntryView *view, gboolean clickable);
 
 void		rb_entry_view_set_model			(RBEntryView *view,
