Merge "Fixed icons overlapping issue." into main