Comment 2 for bug 1327929

Your patch is mostly broken. contenttype.cpp doesn't contain any changes at all and your mainscr.cpp breaks infopanel when you place your mouse cursor over unit without clicking on it. So I've imported changes only from icons.cpp