diff --git a/ChangeLog b/ChangeLog
index 2e808bdb5..de8783043 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-18  Eric Wasylishen  <ewasylishen@gmail.com>
+
+	* Images/nsmapping.strings: Add a few more mappings, including
+	toolbar images
+
 2011-11-18  Eric Wasylishen  <ewasylishen@gmail.com>
 
 	* Source/GSNibLoading.m:
diff --git a/Images/nsmapping.strings b/Images/nsmapping.strings
index fa4390e57..53ab37674 100644
--- a/Images/nsmapping.strings
+++ b/Images/nsmapping.strings
@@ -17,3 +17,18 @@ GSOpenHandCursor = common_OpenHandCursor;
 GSDragCopyCursor = common_copyCursor;
 GSDragLinkCursor = common_linkCursor;
 GSOperationNotAllowedCursor = common_noCursor;
+
+/* Toolbar images */
+
+NSToolbarCustomizeToolbarItemImage = common_ToolbarCustomizeToolbarItem;
+NSToolbarPrint = common_Printer;
+NSToolbarShowColors = common_ToolbarShowColorsItem;
+NSToolbarShowFonts = common_ToolbarShowFontsItem;
+
+/* Misc. */
+
+NSColorPanel = common_ToolbarShowColorsItem;
+NSComputer = common_Root_PC;
+NSStopProgressTemplate = GSStop;
+NSFontPanel = common_ToolbarShowFontsItem;
+NSFolder = common_Folder;
\ No newline at end of file