Changed extension icon
Merge remote-tracking branch 'origin/master'
Removed merge errors