Rebuild and fix valign in icon for zillionth time