Merge "Update X, -, + icons in dnd panel" into oc-dr1-dev
am: 6b0c1604a6

Change-Id: I400f6c493469bc775bce9ef903fd496a33524a74