Merge pull request #21931 from nullaus/bug1038167

bug 1038167 - Remove 80x80, 256x256. Add 84x84. Update System to correct...
(cherry picked from commit 3c2e98b35cd1f50e55be1c374ff460d9244c9514)
Merge pull request #21932 from nullaus/bug1038167

bug 1038167 - Add 84x84 icons.
(cherry picked from commit 163a63012cdae5c6f77e5bba81a51ab35ac2cf32)