Fix arrow icon and update test cases