diff --git a/typing-break/ChangeLog b/typing-break/ChangeLog
index 60102d644..1de63166b 100644
--- a/typing-break/ChangeLog
+++ b/typing-break/ChangeLog
@@ -1,3 +1,13 @@
+2008-03-24  Jens Granseuer  <jensgr@gmx.net>
+
+	* bar*.png: new Tango-style icons by David Prieto
+	<frandavid100@gmail.com> (bug #523965)
+
+	* drw-break-window.c: (drw_break_window_init): replace custom stop icon
+	by gtk-stop stock icon
+	* Makefile.am:
+	* stop.png: remove
+
 2008-02-05  Jens Granseuer  <jensgr@gmx.net>
 
 	* drwright.c: add a comment for translators (bug #514598)
diff --git a/typing-break/Makefile.am b/typing-break/Makefile.am
index 99bbff80c..c934991a8 100644
--- a/typing-break/Makefile.am
+++ b/typing-break/Makefile.am
@@ -24,7 +24,7 @@ gnome_typing_monitor_CFLAGS = \
 gnome_typing_monitor_LDADD = @TYPING_LIBS@ @SCREENSAVER_LIBS@
 
 imagedir = $(pkgdatadir)/pixmaps
-dist_image_DATA = stop.png bar.png bar-red.png bar-green.png bar-disabled.png ocean-stripes.png
+dist_image_DATA = bar.png bar-red.png bar-green.png bar-disabled.png ocean-stripes.png
 
 # Themeable application icon
 icondir = $(datadir)/icons/hicolor/48x48/apps
diff --git a/typing-break/bar-disabled.png b/typing-break/bar-disabled.png
index 36bef4b4e..247e976cf 100644
Binary files a/typing-break/bar-disabled.png and b/typing-break/bar-disabled.png differ
diff --git a/typing-break/bar-green.png b/typing-break/bar-green.png
index f1755b303..8979d10cf 100644
Binary files a/typing-break/bar-green.png and b/typing-break/bar-green.png differ
diff --git a/typing-break/bar-red.png b/typing-break/bar-red.png
index 06118d14b..dd3db7679 100644
Binary files a/typing-break/bar-red.png and b/typing-break/bar-red.png differ
diff --git a/typing-break/bar.png b/typing-break/bar.png
index 5587fe65b..4eead01c9 100644
Binary files a/typing-break/bar.png and b/typing-break/bar.png differ
diff --git a/typing-break/drw-break-window.c b/typing-break/drw-break-window.c
index d3d631fd2..e9a1f7898 100644
--- a/typing-break/drw-break-window.c
+++ b/typing-break/drw-break-window.c
@@ -222,7 +222,7 @@ drw_break_window_init (DrwBreakWindow *window)
 	gtk_widget_show (hbox);
 	gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, FALSE, 0);
 
-	priv->image = gtk_image_new_from_file (IMAGEDIR "/stop.png");
+	priv->image = gtk_image_new_from_stock ("gtk-stop", GTK_ICON_SIZE_DIALOG);
 	gtk_misc_set_alignment (GTK_MISC (priv->image), 1, 0.5);
 	gtk_widget_show (priv->image);
 	gtk_box_pack_start (GTK_BOX (hbox), priv->image, TRUE, TRUE, 8);
diff --git a/typing-break/stop.png b/typing-break/stop.png
deleted file mode 100644
index b786dd724..000000000
Binary files a/typing-break/stop.png and /dev/null differ