Merge "Update X, -, + icons in dnd panel" into oc-dr1-dev