They've always looked fine to me.
Perhaps rotate them so the government hammer is oriented to the left, the commerce horizontal, and the social to the right?
It also depends if color is going to be added to the descriptions of buildings to help identify government, social, an commerce. If it is, then you don't want to diverge from the current colors.