Merge "Update the subtype icon properly."