Fix UI error on new theme