Icon tweaks

Use an SVG icon with a PNG fallback for the close button.

Change-Id: Id79c40046f7596f035f4263caf6ecbf4abb40263
Merge "Icon tweaks"