Merge "Revert "Edit dnd icon in volume dialog"" into pi-dev am: 630f58ea04
am: 90096a6cac

Change-Id: I5ca0fca264e3ef70f1dfa7afdcd2a0a98bc23e0d