fix background color for focused buttons

commit 7240368 from master manually applied
add some missing properties