#25: Icons text and layout updated.