Icons for client and monitor
Merge remote-tracking branch 'origin/master'