Switch to density pixels. Renaming.

Looks better on high-dpi phones like Nexus 5.

Updated naming to be more coherent.