Backout 0708b8629399 and a2aa2637a1b7 to fix commit message. r=fixup
Bug 914740 - Reland drawable and -moz-icon changes. r=mfinkle DONTBUILD