Merge pull request #12575 from crdlc/bug-922585

Bug 922585 - Maximum number of icons is wrong on first page
Bug 921377 - E.me Collection name translation