dont overwrite background image when hovering over button

Backport #2895 so apps are compatible. Please review again because of merge conflict @Raydiation @raghunayyar.