Fixing icon declarations and info