EB-7198 - Catalog Grid Icons -INITIAL COMMIT--- using the files for the new pagination as a base for this story.
Merge remote-tracking branch 'upstream/master'