Fixed some flows and icons