Merge "Volume iconography update" into pi-dev