Fixed preferences repainting on theme change and cleaned up toolbar button borders