Fixing favorite icon color, merging fault, format using spaces