Bug5115

Bug 5115 resulted in people only being able to rename one icon which previously had a pic#xxx keyword.  A little investigation revealed this only occurred when the icon was unused and had never previously had keywords attached.  It turned out to be caused because the icon was not assigned a proper mapid when it was renamed and so the relevant database row was over-written the next time a pic#xxx icon was renamed.