Merge "Make BT icon more prominent" into pi-dev