Move mode toggle button to more intuitive location

Please with some new version do move mode toggle button to more intuitive location.
It would prevent or reduce confusion of the GWD users. Consider this just like nice to have feature.
It could be done
a) by shifting the whole toolbar to left or
b) placing the button on the working window header or in corner right under it (and maybe make it same size as the toggle icon in the run window).
c) keep only one button that toggles mode on both previews simultaneously.

How about Add AOD toggle button to work window and allow the AOD mode button in the menu bar to toggle both Work and preview windows.

Samsung Developer Program

yes, thats good variation too