Fixed Magma issues

- Fixed icon weirdness
- Fixed Bucket duplication
- Fixed Magma flowing too far
Closes #246