Changed icon
It's prettier now
Changed theme
Merging
merged conflict