diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index c9d10ecddf..54f5002380 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -308,12 +308,19 @@ namespace Content.Shared.Preferences
             return sex;
         }
 
-            // Corvax-TTS-Start
+        // Corvax-TTS-Start
+        public static String RandomTTS(Sex sex)
+        {
+            var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
+            var random = IoCManager.Resolve<IRobustRandom>();
+
             var voiceId = random.Pick(prototypeManager
                 .EnumeratePrototypes<TTSVoicePrototype>()
                 .Where(o => CanHaveVoice(o, sex)).ToArray()
             ).ID;
-            // Corvax-TTS-End
+            return voiceId;
+        }
+        // Corvax-TTS-End
 
         /// <summary>
         /// Picks a random gender using species sex;
@@ -380,11 +387,10 @@ namespace Content.Shared.Preferences
             profile.Gender = (randomizeCfg & RandomizeCfg.Gender) != 0 ? RandomGender(profile.Sex) : baseProfile.Gender;
             profile.Name = (randomizeCfg & RandomizeCfg.Name) != 0 ? RandomName(speciesProto, profile.Gender) : baseProfile.Name;
             profile.Age = (randomizeCfg & RandomizeCfg.Age) != 0 ? RandomAge(speciesProto) : baseProfile.Age;
-
+            profile.TTSVoice = (randomizeCfg & RandomizeCfg.Age) != 0 ? RandomTTS(profile.Sex) : baseProfile.TTSVoice; // Corvax-TTS
             profile.Appearance = HumanoidCharacterAppearance.Random(randomizeCfg, baseProfile.Appearance, speciesProto, profile.Sex);
 
             return profile;
-                TTSVoice = voiceId, // Corvax-TTS
         }
 
         /// <summary>
diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Corvax/Entities/Objects/Devices/pda.yml
index e116f452aa..4e9a4a0e43 100644
--- a/Resources/Prototypes/Corvax/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Corvax/Entities/Objects/Devices/pda.yml
@@ -36,14 +36,16 @@
     accentVColor: "#DFDFDF"
   - type: Icon
     state: pda-seniorofficer
-  - type: CartridgeLoader
-    preinstalled:
-    - CrewManifestCartridge
-    - NotekeeperCartridge
-    - NanoTaskCartridge
-    - NewsReaderCartridge
-    - WantedListCartridge
-    - AstroNavCartridge
+  - type: EntityTableContainerFill
+    containers:
+      preinstalled-program-container: !type:AllSelector
+        children:
+        - id: CrewManifestCartridge
+        - id: NotekeeperCartridge
+        - id: NanoTaskCartridge
+        - id: NewsReaderCartridge
+        - id: WantedListCartridge
+        - id: AstroNavCartridge
 
 - type: entity
   parent: BaseSecurityPDA
diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/printing.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/printing.png
index 516ebc1e21..7297e7d322 100644
Binary files a/Resources/Textures/Structures/Machines/fax_machine.rsi/printing.png and b/Resources/Textures/Structures/Machines/fax_machine.rsi/printing.png differ