fixed message field and file_upload remove icon.

whoop team work! Matt helped make this happen.