Join (visually) the inner toolbar and inner tab-bar (issue 7004)