Fixed issue: Removed dublicated icons and not needed, old methods