master default icon-color-and-image-fixes