Merge "Add Settings icons needed for theme overlaying." into qt-dev