Changed icons to white ones
Merge remote-tracking branch 'origin'