Merge "Fix bug 5032301 - size list menu icons appropriately."