updated button and icons part 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	UMDF/src/main/res/layout/connect_layout.xml