Merge "Fix Tab width with using icon + centered tabs" into mnc-ub-dev