Merge "Fix alert dialog icon"