Merge "Prototype replacing small icons with app icons." into main