[Task #2797]: Fixed Remove Button

@pamval please review