merge into master

fixing a drawable