Merge "Touchpad settings' icons update" into udc-dev