L1+R1 will sheathe/draw your weapon. I also recommend disabling auto-sheathe in the options menu: