Merge "Rename ic_cancel.png -> ic_close.png" into ub-deskclock-escargatoire