Previous rename was wrong as it overlapped with another variable in use,
thus breaking everything. D'oh !

This reverts commit 2a90d5b3.

Looks like a sed failure happened before ><

This is required to get correct drawing in Locked mode

This option is available in the Settings panel and is not likely to
change often, so we can use the free space there for other means.

(also expand toolbar in compact/standard modes)