Merge "Revert "Edit dnd icon in volume dialog"" into pi-dev