Small optimizations, and fix too-large broken-file icon.