[TASK] Adapt convention based icon locations for pages
Merge pull request #237 from coding46/AdaptConventionBasedIconLocations

[TASK] Adapt convention based icon locations for pages