Issue #498 Changing button designs