Fix compilation and add higher-contrast icons.