Index: data/totem.glade
===================================================================
RCS file: /cvs/gnome/totem/data/totem.glade,v
retrieving revision 1.110
diff -p -u -r1.110 totem.glade
--- data/totem.glade	2 Aug 2005 10:24:35 -0000	1.110
+++ data/totem.glade	11 Aug 2005 09:15:01 -0000
@@ -2836,18 +2836,19 @@ AC3 Passthrough</property>
 		      <property name="spacing">6</property>
 
 		      <child>
-			<widget class="GtkButton" id="tmw_previous_button">
+			<widget class="GtkButton" id="tmw_play_pause_button">
+			  <property name="width_request">80</property>
 			  <property name="visible">True</property>
 			  <property name="sensitive">False</property>
-			  <property name="tooltip" translatable="yes">Previous</property>
+			  <property name="tooltip" translatable="yes">Play/Pause</property>
 			  <property name="can_focus">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>
 
 			  <child>
-			    <widget class="GtkImage" id="image121">
+			    <widget class="GtkImage" id="image178">
 			      <property name="visible">True</property>
-			      <property name="stock">gtk-media-previous</property>
+			      <property name="stock">gtk-media-play</property>
 			      <property name="icon_size">4</property>
 			      <property name="xalign">0.5</property>
 			      <property name="yalign">0.5</property>
@@ -2864,18 +2865,18 @@ AC3 Passthrough</property>
 		      </child>
 
 		      <child>
-			<widget class="GtkButton" id="tmw_play_pause_button">
+			<widget class="GtkButton" id="tmw_previous_button">
 			  <property name="visible">True</property>
 			  <property name="sensitive">False</property>
-			  <property name="tooltip" translatable="yes">Play/Pause</property>
+			  <property name="tooltip" translatable="yes">Previous</property>
 			  <property name="can_focus">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>
 
 			  <child>
-			    <widget class="GtkImage" id="tmw_play_pause_button_image">
+			    <widget class="GtkImage" id="image121">
 			      <property name="visible">True</property>
-			      <property name="stock">gtk-media-play</property>
+			      <property name="stock">gtk-media-previous</property>
 			      <property name="icon_size">4</property>
 			      <property name="xalign">0.5</property>
 			      <property name="yalign">0.5</property>
Index: src/totem.c
===================================================================
RCS file: /cvs/gnome/totem/src/totem.c,v
retrieving revision 1.455
diff -p -u -r1.455 totem.c
--- src/totem.c	3 Aug 2005 18:08:04 -0000	1.455
+++ src/totem.c	11 Aug 2005 09:15:05 -0000
@@ -260,9 +260,7 @@ play_pause_set_label (Totem *totem, Tote
 		return;
 	}
 
-	image = glade_xml_get_widget (totem->xml,
-			"tmw_play_pause_button_image");
-	gtk_image_set_from_stock (GTK_IMAGE (image), id, GTK_ICON_SIZE_BUTTON);
+	gtk_button_set_label (GTK_BUTTON (totem->pp_button), id);
 	image = glade_xml_get_widget (totem->xml, "tcw_pp_button_image");
 	gtk_image_set_from_stock (GTK_IMAGE (image), id, GTK_ICON_SIZE_BUTTON);
 
@@ -3468,6 +3466,10 @@ main (int argc, char **argv)
 	totem_callback_connect (totem);
 	totem_setup_window (totem);
 
+	/* Give the Play/Pause button a stock label before widgets are shown to avoid flickering */
+	gtk_button_set_use_stock (GTK_BUTTON (totem->pp_button), TRUE);
+	gtk_button_set_label (GTK_BUTTON (totem->pp_button), GTK_STOCK_MEDIA_PLAY);
+
 	/* Show ! gtk_main_iteration trickery to show all the widgets
 	 * we have so far */
 	gtk_widget_show (totem->win);
