(Issue #3368) Fix full screen margins