On 17 September 2004, the Scuba Diver Badge was discontinued in lieu of a new Special Operations Diver Badge and an additional grade, the Special Operations Diving Supervisor Badge, was created.
Prior to this change, the basic Scuba Diver Badge was the same for all of the U.S. armed forces. The new design includes sharks, symbolizing speed, stealth, and lethal efficiency, and two Fairbairn-Sykes Fighting Knives in saltire, representing the heritage of OSS Operational Swimmers during World War II.
The Combat Diver Qualification and Combat Diving Supervisors Courses are taught by Company C, 2nd Battalion, 1st Special Warfare Training Group at the Special Forces Underwater Operations School, Naval Air Station Key West.