Merge "Tweaking the qsb padding to push icons in." into jb-dev