Fixing SmartList issue, updating iconography.