Merge "Fix missing HUN icon after direct reply" into main