OS X :: Changing Default File Icons - Dock Not Recognize Finder Image

On my Macbook, running Leopard, I recently changed all my icons. (applications, folders, default files, etc.) I changed the Finder and Trash icons via System/Library/CoreServices. But the Dock won't recognize that the Finder icon has changed-- it's still showing me the old icon. That's Problem 1.

Then I created a new user account, and discovered that on that account the Dock shows the correct Finder image. But Problem 2: the new account doesn't recognize my default file icons. It flashes them for a second when I save the file, and then reverts back to the regular white default image. (Even though all the .icns files are correct in the application's Resources folder.) I really don't want to download Candybar or anything, since I know it can be done without that.