Completed icon functionality and made more robust