Message and Icon cleanup