Why are you making the JD larger? I think it interferes with the flow.
If you have to make it larger, I would stack it on top of Construction, lose the hammer and put the saw blade over top.
I'd actually make a completely different icon than a hammer or saw, which have both been done to...