[FIX] Move icons from cherrypicked commit back to __unported__ or remove if module is obsolete