Smoke graphics rework (#1088)