SONAR-4851 Fix arrows behavior