Cosmetic changes and button image bad rendering workaround