Merge "Tune visuals for inline settings" into nyc-dev