BOEN-1768 BOEN-1807 - Updated graphics