diff --git a/typing-break/ChangeLog b/typing-break/ChangeLog
index 34c4abde4..25b2b3222 100644
--- a/typing-break/ChangeLog
+++ b/typing-break/ChangeLog
@@ -1,3 +1,13 @@
+2007-01-09  Vincent Untz <vuntz@gnome.org>
+
+	* main.c: (main): set default window icon and application name
+	* Makefile.am: install icons
+	* drwright.c: (popup_about_cb): use gtk_about_dialog_show()
+	* typing-monitor.png:
+	* typing-monitor.svn: new
+	Fix bug #348641, icon by Andreas Nilsson <nisses.mail@home.se>, patch
+	by Luca Cavalli <luca.cavalli@gmail.com>
+
 2006-11-15  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* Makefile.am: Don't redefine GNOMELOCALEDIR.
diff --git a/typing-break/Makefile.am b/typing-break/Makefile.am
index 83ce8a547..f4fead043 100644
--- a/typing-break/Makefile.am
+++ b/typing-break/Makefile.am
@@ -23,4 +23,21 @@ gnome_typing_monitor_LDFLAGS = -export-dynamic
 imagedir = $(GNOMECC_PIXMAPS_DIR)
 image_DATA = stop.png bar.png bar-red.png bar-green.png bar-disabled.png ocean-stripes.png
 
-EXTRA_DIST = $(image_DATA)
+# Themeable application icon
+icondir = $(datadir)/icons/hicolor/48x48/apps
+icon_DATA = typing-monitor.png
+svgicondir = $(datadir)/icons/hicolor/scalable/apps
+svgicon_DATA = typing-monitor.svg
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+install-data-hook:
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating Gtk icon cache."; \
+		$(gtk_update_icon_cache); \
+	else \
+		echo "*** Icon cache not updated.  After install, run this:"; \
+		echo "***   $(gtk_update_icon_cache)"; \
+	fi
+
+EXTRA_DIST = $(image_DATA)   \
+             $(icon_DATA)    \
+             $(svgicon_DATA)
diff --git a/typing-break/drwright.c b/typing-break/drwright.c
index a0e0f0e63..fdbd087b6 100644
--- a/typing-break/drwright.c
+++ b/typing-break/drwright.c
@@ -593,48 +593,23 @@ popup_about_cb (gpointer   callback_data,
 		guint      action,
 		GtkWidget *widget)
 {
-	static GtkWidget *about_window;
-	GdkPixbuf        *icon;
-	char             *authors [] = {
+	gint   i;
+	gchar *authors[] = {
 		N_("Written by Richard Hult <richard@imendio.com>"),
 		N_("Eye candy added by Anders Carlsson"),
 		NULL
 	};
-	int i;
 
-	if (about_window) {
-		gtk_window_present (GTK_WINDOW (about_window));
-		return;
-	}
-	
 	for (i = 0; authors [i]; i++)
 		authors [i] = _(authors [i]);
 
-	about_window = gtk_about_dialog_new ();
-
-	g_signal_connect (about_window,
-			  "destroy",
-                          G_CALLBACK (gtk_widget_destroyed),
-			  &about_window);
-	
-	icon = NULL; /*gdk_pixbuf_new_from_file (IMAGEDIR "/bar.png", NULL);*/
-	
-	g_object_set (about_window,
-		      "name", _("Typing Monitor"),
-		      "version", VERSION,
-		      "comments", _("A computer break reminder."),
-		      "authors", authors,
-		      "logo", icon,
-		      NULL);
-
-	if (icon != NULL)
-		g_object_unref (icon);
-
-	g_signal_connect (about_window,
-			  "response", G_CALLBACK (gtk_widget_destroy),
-			  NULL);
-
-	gtk_widget_show (about_window);
+	gtk_show_about_dialog (NULL,
+			       "authors", authors,
+			       "comments",  _("A computer break reminder."),
+			       "logo-icon-name", "typing-monitor",
+			       "translator-credits", _("translator-credits"),
+			       "version", VERSION,
+			       NULL);
 }
 
 static void
diff --git a/typing-break/main.c b/typing-break/main.c
index 2c98c4be8..83a6a2e1f 100644
--- a/typing-break/main.c
+++ b/typing-break/main.c
@@ -81,6 +81,9 @@ main (int argc, char *argv[])
 		++i;
 	}
 
+	g_set_application_name (_("Typing Monitor"));
+	gtk_window_set_default_icon_name ("typing-monitor");
+
 	gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, 
 			    argc, argv, NULL);
 
diff --git a/typing-break/typing-monitor.png b/typing-break/typing-monitor.png
new file mode 100644
index 000000000..41ee09cff
Binary files /dev/null and b/typing-break/typing-monitor.png differ
diff --git a/typing-break/typing-monitor.svg b/typing-break/typing-monitor.svg
new file mode 100644
index 000000000..b8298719d
--- /dev/null
+++ b/typing-break/typing-monitor.svg
@@ -0,0 +1,336 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg4908"
+   sodipodi:version="0.32"
+   inkscape:version="0.44+devel"
+   sodipodi:docbase="/home/andreas/project/application icons/48x48"
+   sodipodi:docname="typing-monitor.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/andreas/project/application icons/48x48/typing-monitor.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   sodipodi:modified="TRUE">
+  <defs
+     id="defs4910">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7007">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop7009" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop7011" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6997">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop6999" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:0;"
+         offset="1"
+         id="stop7001" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6987">
+      <stop
+         style="stop-color:#503000;stop-opacity:1"
+         offset="0"
+         id="stop6989" />
+      <stop
+         style="stop-color:#6f4501;stop-opacity:1"
+         offset="1"
+         id="stop6991" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6979">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop6981" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop6983" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5962">
+      <stop
+         style="stop-color:#d8d8d0;stop-opacity:1"
+         offset="0"
+         id="stop5964" />
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1"
+         offset="1"
+         id="stop5966" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5952">
+      <stop
+         style="stop-color:#a9ada4;stop-opacity:0.16494845;"
+         offset="0"
+         id="stop5954" />
+      <stop
+         id="stop5960"
+         offset="0.5"
+         style="stop-color:#dbdcd9;stop-opacity:0.94901961;" />
+      <stop
+         style="stop-color:#9fa399;stop-opacity:0;"
+         offset="1"
+         id="stop5956" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5938">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1;"
+         offset="0"
+         id="stop5940" />
+      <stop
+         id="stop5946"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         style="stop-color:#e4e4e1;stop-opacity:1;"
+         offset="1"
+         id="stop5942" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5918">
+      <stop
+         style="stop-color:#555753;stop-opacity:1;"
+         offset="0"
+         id="stop5920" />
+      <stop
+         style="stop-color:#555753;stop-opacity:0;"
+         offset="1"
+         id="stop5922" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5918"
+       id="radialGradient5924"
+       cx="24.23378"
+       cy="36.63369"
+       fx="24.23378"
+       fy="36.63369"
+       r="16.061426"
+       gradientTransform="matrix(1.0419567,3.4062366e-7,0,0.2338642,-1.0167686,29.144193)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5938"
+       id="linearGradient5944"
+       x1="9.0885315"
+       y1="29.413193"
+       x2="30.001532"
+       y2="29.514208"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0030622,0,0,1,-0.1178936,-1.9999983)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5952"
+       id="linearGradient5958"
+       x1="26.005463"
+       y1="16.791273"
+       x2="35.894749"
+       y2="5.3816786"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9473685,0,0,0.9266,1.9999999,-0.8531999)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5962"
+       id="radialGradient5968"
+       cx="17.504116"
+       cy="38.896267"
+       fx="17.504116"
+       fy="38.896267"
+       r="22.160923"
+       gradientTransform="matrix(0.9309009,-1.7410792e-2,4.7534748e-3,0.2323648,7.9437685,28.267387)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6979"
+       id="linearGradient6985"
+       x1="38.85714"
+       y1="31.5"
+       x2="40.642857"
+       y2="31.5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-1)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6987"
+       id="radialGradient6993"
+       cx="23.992792"
+       cy="28.918667"
+       fx="23.992792"
+       fy="28.918667"
+       r="14.691718"
+       gradientTransform="matrix(1.3068587,-1.1013411e-2,2.7605408e-3,0.2917953,-7.2677551,16.22393)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6997"
+       id="radialGradient7003"
+       cx="24.266502"
+       cy="40.09565"
+       fx="24.266502"
+       fy="40.09565"
+       r="23.964285"
+       gradientTransform="matrix(0.9539749,-7.3807993e-6,-2.5091472e-8,0.2691364,1.132661,29.95978)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7007"
+       id="radialGradient7013"
+       cx="43.551655"
+       cy="25.449492"
+       fx="43.551655"
+       fy="25.449492"
+       r="1.2435335"
+       gradientTransform="matrix(2.8786818,0,0,3.7781028,-81.819703,-70.701311)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="9.8994949"
+     inkscape:cx="31.996918"
+     inkscape:cy="27.672311"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="974"
+     inkscape:window-x="0"
+     inkscape:window-y="26" />
+  <metadata
+     id="metadata4913">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.44021738;fill:url(#radialGradient7003);fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path6995"
+       sodipodi:cx="24.25"
+       sodipodi:cy="40.75"
+       sodipodi:rx="23.964285"
+       sodipodi:ry="5.8928571"
+       d="M 48.214285 40.75 A 23.964285 5.8928571 0 1 1  0.2857151,40.75 A 23.964285 5.8928571 0 1 1  48.214285 40.75 z"
+       transform="matrix(1.0059613,0,0,1.539394,-0.5017047,-25.658877)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:url(#radialGradient5968);fill-opacity:1;stroke:#888a85;stroke-width:0.92989331;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path5912"
+       sodipodi:cx="23.587063"
+       sodipodi:cy="35.171062"
+       sodipodi:rx="21.667772"
+       sodipodi:ry="8.0812206"
+       d="M 45.254835 35.171062 A 21.667772 8.0812206 0 1 1  1.9192905,35.171062 A 21.667772 8.0812206 0 1 1  45.254835 35.171062 z"
+       transform="matrix(1.0384085,0,0,1.1136931,-0.4930076,-3.6697693)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.66847826;fill:url(#radialGradient5924);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path5916"
+       sodipodi:cx="24.496199"
+       sodipodi:cy="38.049999"
+       sodipodi:rx="16.061426"
+       sodipodi:ry="3.8385797"
+       d="M 40.557625 38.049999 A 16.061426 3.8385797 0 1 1  8.4347725,38.049999 A 16.061426 3.8385797 0 1 1  40.557625 38.049999 z"
+       transform="matrix(0.9961755,0,0,1.5630783,-0.3014947,-24.475125)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.00897741;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path5970"
+       sodipodi:cx="23.587063"
+       sodipodi:cy="35.171062"
+       sodipodi:rx="21.667772"
+       sodipodi:ry="8.0812206"
+       d="M 45.254835 35.171062 A 21.667772 8.0812206 0 1 1  1.9192905,35.171062 A 21.667772 8.0812206 0 1 1  45.254835 35.171062 z"
+       transform="matrix(0.9922571,0,0,0.9899493,0.6965858,0.6824308)" />
+    <path
+       style="opacity:1;fill:url(#linearGradient5944);fill-opacity:1;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 23.90625,11.5 C 15.95303,11.5 9.4999998,14.082773 9.5,17.25 L 9.5,31.8125 L 10.5,33.25 C 10.5,33.25 9.8205441,38.5 23.8125,38.5 C 37.89254,38.5 37.6875,33.34375 37.6875,33.34375 L 38.5,32.15625 L 38.5,31.5 L 40.71875,31.5 C 42.818921,31.5 44.500001,29.81892 44.5,27.71875 L 44.5,23.28125 C 44.5,21.181079 42.81892,19.5 40.71875,19.5 L 38.5,19.5 L 38.5,17.25 C 38.5,14.082773 31.85947,11.5 23.90625,11.5 z M 38.5,21.5 L 39.03125,21.5 C 40.403909,21.5 41.5,22.596091 41.5,23.96875 L 41.5,27.03125 C 41.500001,28.403909 40.403908,29.5 39.03125,29.5 L 38.5,29.5 L 38.5,21.5 z "
+       id="path5905" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#d3d7cf;fill-opacity:1;stroke:#888a85;stroke-width:0.96812624;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path5910"
+       sodipodi:cx="24.748737"
+       sodipodi:cy="22.544155"
+       sodipodi:rx="14.142136"
+       sodipodi:ry="3.7375643"
+       d="M 38.890873 22.544155 A 14.142136 3.7375643 0 1 1  10.606602,22.544155 A 14.142136 3.7375643 0 1 1  38.890873 22.544155 z"
+       transform="matrix(0.88616,0,0,1.2039928,2.1008539,-9.1429975)" />
+    <path
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 23.960422,12.500002 C 16.580811,12.500002 10.490543,14.526543 10.490543,17.45916 L 10.515797,31.51384 L 11.526844,33.0544 C 11.526844,33.0544 10.901642,37.500003 23.884461,37.500003 C 36.94901,37.500005 36.757882,32.727848 36.757882,32.727848 L 37.5,31.629548 L 37.49389,17.686444 C 37.49389,14.753828 31.340033,12.500002 23.960422,12.500002 z "
+       id="path5928"
+       sodipodi:nodetypes="ccccscccc" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:url(#radialGradient6993);fill-opacity:1;stroke:#888a85;stroke-width:1.09916472;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path5948"
+       sodipodi:cx="24.748737"
+       sodipodi:cy="22.544155"
+       sodipodi:rx="14.142136"
+       sodipodi:ry="3.7375643"
+       d="M 38.890873 22.544155 A 14.142136 3.7375643 0 1 1  10.606602,22.544155 A 14.142136 3.7375643 0 1 1  38.890873 22.544155 z"
+       transform="matrix(0.8838835,0,0,0.9364388,2.125,-2.1112202)" />
+    <path
+       style="opacity:0.44021738;fill:url(#linearGradient5958);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 20.00983,18.67847 C 20.00983,18.67847 19.712477,13.206563 22.388669,10.260151 C 25.064862,7.3137393 27.741054,9.207861 30.714602,6.8928232 C 33.688151,4.5777853 34.28286,1 34.28286,1 C 34.28286,1 38.874954,5.7239821 37.851119,8.5764868 C 36.827284,11.428993 31.37694,9.884524 30.187523,12.41002 C 28.998102,14.935515 33.093442,18.67847 33.093442,18.67847 C 33.093442,18.67847 28.051699,20.000002 24.780796,20.000002 C 21.509894,20.000002 20.00983,18.67847 20.00983,18.67847 z "
+       id="path5950"
+       sodipodi:nodetypes="czzczzczc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 38,20.5 L 40.57749,20.5 C 42.034984,20.5 43.5,21.525939 43.5,23 L 43.499941,28.217132 C 43.463947,29.280836 42.266279,30.395048 40.437265,30.499107 L 38,30.4486"
+       id="path6959"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient6985);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 37.928571,30.5 L 40.5,30.5"
+       id="path6961" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:url(#radialGradient7013);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 42,20.696954 C 42.69772,21.313113 43.445947,21.878765 43.487067,23 L 43.487067,28 C 43.423512,28.950077 42.998471,29.694158 42,30.202031"
+       id="path7005"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>