The solution to this ticket proposed on https://forum.xwiki.org/t/proposed-layout-changes-for-the-attachment-upload-in-pages/15290 should also help closing XWIKI-14158 and XWIKI-22126.
