Fixing Trebuchet icons and layout