DAR-1485 | UI Drawer styles cleanup