ORB-349] New icons, watermark image and border colour change