Fix frame repaint error caused by the removal of pixmap caching (Bug #2202), fix an issue with themes that miss that menu button.

(Old svn revision: 22847)