UI-3239 Apply correct effect for some icon buttons