More tweakage
Some icon improvements by @gauravjuvekar