Added a workaround using separate drawables