Fixed issue with more miscolored buttons