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

This reverts commit 96080160e0e27ffcfe1f244b4909e911d532c9b9.
Rebase from 'upstream'
Trimmed the branch to only the rocon_icons sub directory