Draw border after drop shadow
Fix issue when changing the toolbar colors