Fix color swap on buttons