Add icon and change Dummy-User-Name
Merge remote-tracking branch 'origin'