Add nice icon and remove default style stub.
Merge remote-tracking branch 'origin/master'