Merge icon in to master

Icon canvas and icon bar