Changed actions icons. Minor refactoring