Generic button highlight fix