Fixing icons see BT#