DeviceSettings: Maybe really fix Activity icons and labels