diff --git a/Resources/Prototypes/Access/cargo.yml b/Resources/Prototypes/Access/cargo.yml
index b071917034..dfcfcd10f7 100644
--- a/Resources/Prototypes/Access/cargo.yml
+++ b/Resources/Prototypes/Access/cargo.yml
@@ -14,7 +14,7 @@
   id: Cargo
   tags:
   - Quartermaster
-  - Salvage # Parkstation now in engineering but we just keep it here.
+  - Salvage
   - Cargo
   - Mail # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml
   - Orders # Delta V - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml
index a123a99151..879c614b36 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml
@@ -59,7 +59,6 @@
       - id: EngineerPDA
         amount: 3
       - id: AtmosPDA
-      - id: SeniorEngineerPDA
       - id: SalvagePDA # Parkstation - Salvage in engineering
         amount: 2
 
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml
index e48d44ccff..d75b01c431 100644
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml
@@ -10,7 +10,8 @@
   - Cargo
   - Maintenance
   - Mail
-
+  - Service
+  
 - type: startingGear
   id: MailCarrierGear
   equipment:
diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
index ef3f8da95b..73f4087493 100644
--- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@@ -22,8 +22,8 @@
   # weight: 10   # Parkstation - No longer command.
   startingGear: QuartermasterGear
   icon: "JobIconQuarterMaster"
-  supervisors: job-supervisors-captain
-  canBeAntag: false
+  supervisors: job-supervisors-css
+  #canBeAntag: false
   access:
   - Cargo
   #- Salvage # Parkstation - Salvage is now engineering
@@ -48,7 +48,7 @@
     back: ClothingBackpackQuartermasterFilled
     shoes: ClothingShoesColorBrown
     id: QuartermasterPDA
-    ears: ClothingHeadsetService #ClothingHeadsetQM
+    ears: ClothingHeadsetQM
     belt: BoxFolderClipboard
     pocket1: AppraisalTool
   innerClothingSkirt: ClothingUniformJumpskirtQM
diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
index 7f7197b5bd..c2cfd99b18 100644
--- a/Resources/Prototypes/Roles/Jobs/departments.yml
+++ b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -3,10 +3,10 @@
   description: department-Cargo-description
   color: "#A46106"
   roles:
-  - CargoTechnician
-  - Quartermaster
-  - SalvageSpecialist # Going to need to change that
-  - MailCarrier # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml
+  #- CargoTechnician
+  #- Quartermaster
+  #- SalvageSpecialist # Going to need to change that
+  #- MailCarrier # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml
 
 - type: department
   id: Civilian
@@ -23,7 +23,6 @@
   - Clown
   #- HeadOfPersonnel # Parkstation - Replaced by ChiefServiceSupervisor as service command.
   - MailCarrier # Parkstation - civilian job
-  - CargoTechnician # Parkstation - civilian job
   - ChiefServiceSupervisor # Parkstation-CSS
   - Quartermaster # Parkstation - the cargo man.
   - Janitor
diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMailCarrier.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMailCarrier.png
index 1b0acdd241..48e9214ae2 100644
Binary files a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMailCarrier.png and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMailCarrier.png differ
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/QuarterMaster.png b/Resources/Textures/Interface/Misc/job_icons.rsi/QuarterMaster.png
index 2e2e6fdcd6..c90568a350 100644
Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/QuarterMaster.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/QuarterMaster.png differ