Fix halting logic.
Adjust icon sizes
Moderize test cases