Smaller icon
Fix generics