Merge "bug 2542580: fix bad icon." into froyo