Fix x-show-icons issue (RM-2411)