Factored out string duplication in afforementioned methods into two steps to, with hope, actually make icon_name trim the file extension