Dense Two-Dimensional Systems Of Colloidal Tri-Stars And Rhombs