Refactor image addition

The only visible change is that <img> titles now don't show image code for
Horus names and such, like cartouches were treated before.

Change-Id: I1563934d7e9dad26ca18729f0d40b6932aa1f9bf
Merge "Refactor image addition"