Moved quick highlight into toolbar along with lighting