Here is my attempt:
Feel free to take my image and move the icons around if you think my guesses are wrong.

I updated the image with all the new skill descriptions from the data mined info. There are now 2 passive and 2 active skills without icons and one extra icon.

Information Sources:

Screenshot that shows which icon goes with which Primary skill.

Screenshot that shows which icon goes with which Secondary skill.

Another screenshot I used to match icons to skills.

The icons themselves.

Some skill descriptions translated from French to English by Google

Skill descriptions in English either from the data mined information or from a video I watched where a dude read skill descriptions

I got a response from a blue (Grimiku) on the official forums:
http://us.battle.net/d3/en/forum/topic/9964106501

I updated the image with all the new skill descriptions from the data mined info. There are now 2 passive and 2 active skills without icons and one extra icon.