Howdy,
I had the same issue, so I went ahead and tore down and modified the old Jetpack site icon module and made a standalone plugin to move it to the general settings screen.
If you’re still in need – try it out and let me know if it works well for you.
https://wordpress.org/plugins/move-site-icon-to-settings/
