DeviceSettings: Fix Activity icons and labels [1/2]
Merge pull request #28 from zwliew/patch-1

DeviceSettings: Fix Activity icons and labels [1/2]