2nd picture is correct.
They will bend back as you push it into place. It is often a little tricky and difficult to put the hammer in place due to the fact that you will be working against the spring tension.
15-minute trigger job actually works. It will reduce the pull significantly. However, you risk having light primer strikes or some form of reliability issue. Some people have good luck, others do not. For some it works, but they don't trust it for duty.