Second attempt to fix missing control icons