Having the same issue with normal hotbars. Creating a new gear set resets that class's skills with a merge of all macros.