Issue #1847314 by oresh, jessebeach, mattimck, nod_: Fixed Reduce the dependency on JavaScript for the toolbar to display properly.