BOEN-1768 BOEN-1804 - Updated graphics