Starting to replace icons with proper ones