Moved Icon lookup into its own class
Added bad index protection that seems like a hack
Use custom ListCellRenderer for provider search