Fixes some attached 'File' display anomalies, revert Gallery view to previous [#948]