Add moar Pie buttons (2/2)

Plus a tiny bit of clean up

Conflicts:
	res/values/strings.xml
	res/xml/pie_settings.xml