note sync status icon position
merge code