Clean up visual glitches caused by color and button refactorings.