Revert "Trimmed the branch to only the rocon_icons sub directory"

This reverts commit 52286a51341c2d68fe949e4a3b7ab7ac813e301e.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the rocon_icons sub directory