This commit remove the extra space that was added between icons and file names in commit 128fadd, and adds an option to put them back. Re-fixes GH-619 and fixes GH-541.
128fadd