diff --git a/lib/ChangeLog b/lib/ChangeLog
index 01573b0fb0..1eec276765 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,8 @@
 2003-06-24  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
+	* images/*: rename a few icons because to follow the latest lfun
+	renaming frenzy
+
 	* configure.m4: add some code to workaround zsh incompatibilities
 	(bug 977)
 
@@ -37,9 +40,10 @@
 
 2003-06-12  Angus Leeming  <leeming@lyx.org>
 
-	* scripts/fig2pdftex.sh (legacy_xfig): Extract the necessary magic from
-	epstopdf and write it as a shell function, as suggested by Martin Vermeer.
-	Means that we are not dependent on the presence of epstopdf or of perl.
+	* scripts/fig2pdftex.sh (legacy_xfig): Extract the necessary magic
+	from epstopdf and write it as a shell function, as suggested by
+	Martin Vermeer. Means that we are not dependent on the presence of
+	epstopdf or of perl.
 
 2003-06-12  Angus Leeming  <leeming@lyx.org>
 
@@ -104,7 +108,8 @@
 
 2003-06-03  Angus Leeming  <leeming@lyx.org>
 
-	* external_templates: modify the templates to use the converter" mechanism.
+	* external_templates: modify the templates to use the converter"
+	mechanism.
 
 2003-06-02  John Levon  <levon@movementarian.org>
 
diff --git a/lib/images/layout-character.xpm b/lib/images/dialog-show_character.xpm
similarity index 100%
rename from lib/images/layout-character.xpm
rename to lib/images/dialog-show_character.xpm
diff --git a/lib/images/find-replace.xpm b/lib/images/dialog-show_findreplace.xpm
similarity index 100%
rename from lib/images/find-replace.xpm
rename to lib/images/dialog-show_findreplace.xpm
diff --git a/lib/images/math-panel.xpm b/lib/images/dialog-show_mathpanel.xpm
similarity index 100%
rename from lib/images/math-panel.xpm
rename to lib/images/dialog-show_mathpanel.xpm
diff --git a/lib/images/buffer-print.xpm b/lib/images/dialog-show_print.xpm
similarity index 100%
rename from lib/images/buffer-print.xpm
rename to lib/images/dialog-show_print.xpm
diff --git a/lib/images/spellchecker.xpm b/lib/images/dialog-show_spellchecker.xpm
similarity index 100%
rename from lib/images/spellchecker.xpm
rename to lib/images/dialog-show_spellchecker.xpm
diff --git a/src/ChangeLog b/src/ChangeLog
index 1de7eee2ad..23eea8d8a7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2003-06-24  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* ToolbarBackend.C (getIcon): complain when icon cannot be found
+
+2003-06-24  "Garst R. Reese" <reese@isn.net>
+
+	* debug.C: fix typo
+
 2003-06-23  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* lyx_main.C (init): honor LYX_DIR_14x and LYX_USERDIR_14x
diff --git a/src/ToolbarBackend.C b/src/ToolbarBackend.C
index 412616db59..69cddfe234 100644
--- a/src/ToolbarBackend.C
+++ b/src/ToolbarBackend.C
@@ -236,6 +236,9 @@ string const ToolbarBackend::getIcon(int action)
 				   << fullname << '\'' << endl;
 		return fullname;
 	}
-
+	
+	lyxerr[Debug::GUI] << "Cannot find icon for command \"" 
+			   << lyxaction.getActionName(f.action) 
+			   << ' ' << f.argument << '"' << endl;
 	return LibFileSearch("images", "unknown", "xpm");
 }
diff --git a/src/debug.C b/src/debug.C
index 6d086ad231..a40f6c45fe 100644
--- a/src/debug.C
+++ b/src/debug.C
@@ -34,7 +34,7 @@ error_item errorTags[] = {
 	{ Debug::INIT,      "init",      N_("Program initialisation")},
 	{ Debug::KEY,       "key",       N_("Keyboard events handling")},
 	{ Debug::GUI,       "gui",       N_("GUI handling")},
-	{ Debug::PARSER,    "parser",    N_("Lyxlex grammer parser")},
+	{ Debug::PARSER,    "parser",    N_("Lyxlex grammar parser")},
 	{ Debug::LYXRC,     "lyxrc",     N_("Configuration files reading")},
 	{ Debug::KBMAP,     "kbmap",     N_("Custom keyboard definition")},
 	{ Debug::LATEX,     "latex",     N_("LaTeX generation/execution")},