Fewer lines affected and glyphs for + and x

Put the code for the buttons back in their original order so fewer lines
are affected, but maintain the desired ordering.