Fix x-bind issue on popup (RM-2509)
Fix x-show-icons issue (RM-2411)