diff --git a/AppKit/CPToolbar.j b/AppKit/CPToolbar.j
index 97e5e7d74..e7d2a7b8a 100644
--- a/AppKit/CPToolbar.j
+++ b/AppKit/CPToolbar.j
@@ -972,7 +972,7 @@ var TOP_MARGIN      = 5.0,
         {
             _imageView = [[CPImageView alloc] initWithFrame:[self bounds]];
 
-            [_imageView setImageScaling:CPScaleNone];
+            [_imageView setImageScaling:CPScaleProportionally];
 
             [self addSubview:_imageView];
         }
diff --git a/Tools/nib2cib/NSCustomResource.j b/Tools/nib2cib/NSCustomResource.j
index aa576a7e7..6a140f550 100644
--- a/Tools/nib2cib/NSCustomResource.j
+++ b/Tools/nib2cib/NSCustomResource.j
@@ -50,6 +50,9 @@ var FILE = require("file");
                 CPLog.warn("*** WARNING: Resource named " + _resourceName + " not found in supplied resources path.");
             else
                 size = imageSize(FILE.join(FILE.cwd(), resourcePath));
+
+            if (resourcePath && FILE.basename(resourcePath) !== FILE.basename(_resourceName))
+                _resourceName = (_resourceName.indexOf("/") === -1 ? "" : FILE.dirname(_resourceName)) + FILE.basename(resourcePath);
         }
 
         _properties = [CPDictionary dictionaryWithObject:size forKey:@"size"];
diff --git a/Tools/nib2cib/NSToolbarItem.j b/Tools/nib2cib/NSToolbarItem.j
index 786decab4..25d304719 100644
--- a/Tools/nib2cib/NSToolbarItem.j
+++ b/Tools/nib2cib/NSToolbarItem.j
@@ -59,7 +59,14 @@ NS_CPToolbarItemIdentifierMap =
         [self setAction:CPSelectorFromString([aCoder decodeObjectForKey:@"NSToolbarItemAction"])];
         [self setEnabled:[aCoder decodeBoolForKey:@"NSToolbarItemEnabled"]];
 
-        [self setImage:[aCoder decodeBoolForKey:@"NSToolbarItemImage"]];
+        var image = [aCoder decodeObjectForKey:@"NSToolbarItemImage"];
+        [self setImage:[aCoder decodeObjectForKey:@"NSToolbarItemImage"]];
+
+        //FIXME: we shouldn't let toolbars have images which are too big at all
+        if (_maxSize.height > 0)
+            _maxSize.height = MIN(_maxSize.height, 32.0);
+        if (_minSize.height > 0)
+            _minSize.height = MIN(_minSize.height, 32.0);
 
         [self setView:[aCoder decodeObjectForKey:@"NSToolbarItemView"]];
 
diff --git a/Tools/nib2cib/Nib2CibKeyedUnarchiver.j b/Tools/nib2cib/Nib2CibKeyedUnarchiver.j
index 3ee13f4a5..81814645f 100644
--- a/Tools/nib2cib/Nib2CibKeyedUnarchiver.j
+++ b/Tools/nib2cib/Nib2CibKeyedUnarchiver.j
@@ -65,8 +65,21 @@ var File = require("file");
             if (File.basename(path) === aName)
                 return path;
 
-            if (File.isDirectory(path))
+            else if (File.isDirectory(path))
                 pathGroups.push(File.listPaths(path));
+
+            else if (!File.extension(aName))
+            {
+                var extensions = ["png", "gif", "jpg", "jpeg", "cib"],
+                    extensionCount = extensions.length,
+                    extension;
+
+                while(extensionCount--)
+                {
+                    if (File.basename(path) === aName+"."+extensions[extensionCount])
+                        return path;
+                }
+            }
         }
     }