Act 5

Effects fixing and icon switching.