(Bug 3715) Property clean-up per 90d's suggestions, fixed icon page