Reverted because the launcher icons are still not correct. Marked as a dupe because slightly newer bug describes the problem better.
Reverted because the launcher icons are still not correct. Marked as a dupe because slightly newer bug describes the problem better.