Merge "Fixed Unbalanced Hover padding in status bar icons" into main