Merge "Update dream settings categories, to fix padding." into tm-dev