Merge "Fix event info buttons size" into jb-dev