Merge "Remove dialog icons" into lmp-dev