You can get Control Panel, Computer and Libraries all together.
To do so:
1. Restore Libraries location to where it was before
2. Create a new shortcut anywhere (e.g. in c:\) and use as path: c:\windows\explorer.exe shell:mycomputerfolder
Rename the shortcut to Computer
and pin it to the taskbar.
3. Create another shortcut and use as path: c:\windows\explorer.exe shell:controlpanelfolder
Rename it to control panel
and pin that too to the taskbar.
Done. You have all three of them pinned.
To change icons in the shortcuts, right-click them, choose properties, change icon, and browse to the file c:\windows\system32\imageres.dll which contains all the fancy icons.