diff --git a/book/source/diag/Binding_Subkeys.png b/book/source/diag/Binding_Subkeys.png
deleted file mode 100644
index a798631..0000000
Binary files a/book/source/diag/Binding_Subkeys.png and /dev/null differ
diff --git a/book/source/diag/Binding_a_UserID.png b/book/source/diag/Binding_a_UserID.png
deleted file mode 100644
index 2e9b815..0000000
Binary files a/book/source/diag/Binding_a_UserID.png and /dev/null differ
diff --git a/book/source/diag/Component_Key.png b/book/source/diag/Component_Key.png
deleted file mode 100644
index 630e5ba..0000000
Binary files a/book/source/diag/Component_Key.png and /dev/null differ
diff --git a/book/source/diag/Components_of_an_OpenPGP_Certificate.png b/book/source/diag/Components_of_an_OpenPGP_Certificate.png
deleted file mode 100644
index 37265cf..0000000
Binary files a/book/source/diag/Components_of_an_OpenPGP_Certificate.png and /dev/null differ
diff --git a/book/source/diag/Fingerprint.png b/book/source/diag/Fingerprint.png
deleted file mode 100644
index 90df2bc..0000000
Binary files a/book/source/diag/Fingerprint.png and /dev/null differ
diff --git a/book/source/diag/Minimal_OpenPGP_certificate.png b/book/source/diag/Minimal_OpenPGP_certificate.png
deleted file mode 100644
index 14900af..0000000
Binary files a/book/source/diag/Minimal_OpenPGP_certificate.png and /dev/null differ
diff --git a/book/source/diag/OpenPGP Certificate.png b/book/source/diag/OpenPGP Certificate.png
deleted file mode 100644
index 04bc8cd..0000000
Binary files a/book/source/diag/OpenPGP Certificate.png and /dev/null differ
diff --git a/book/source/diag/OpenPGPCert_with_privatekeystore.png b/book/source/diag/OpenPGPCert_with_privatekeystore.png
deleted file mode 100644
index 005f966..0000000
Binary files a/book/source/diag/OpenPGPCert_with_privatekeystore.png and /dev/null differ
diff --git a/book/source/diag/OpenPGP_Certificate.png b/book/source/diag/OpenPGP_Certificate.png
deleted file mode 100644
index 8fec825..0000000
Binary files a/book/source/diag/OpenPGP_Certificate.png and /dev/null differ
diff --git a/book/source/diag/OpenPGP_Certificate_packet.png b/book/source/diag/OpenPGP_Certificate_packet.png
deleted file mode 100644
index d0a2de8..0000000
Binary files a/book/source/diag/OpenPGP_Certificate_packet.png and /dev/null differ
diff --git a/book/source/diag/OpenPGP_Certificate_packet_2.png b/book/source/diag/OpenPGP_Certificate_packet_2.png
deleted file mode 100644
index 0043f44..0000000
Binary files a/book/source/diag/OpenPGP_Certificate_packet_2.png and /dev/null differ
diff --git a/book/source/diag/OpenPGP_Certificate_packet.svg b/book/source/diag/OpenPGP_Signature_packet.svg
similarity index 100%
rename from book/source/diag/OpenPGP_Certificate_packet.svg
rename to book/source/diag/OpenPGP_Signature_packet.svg
diff --git a/book/source/diag/OpenPGP_Certificate_packet_2.svg b/book/source/diag/OpenPGP_Signature_packet_2.svg
similarity index 100%
rename from book/source/diag/OpenPGP_Certificate_packet_2.svg
rename to book/source/diag/OpenPGP_Signature_packet_2.svg
diff --git a/book/source/diag/Primary_key_metadata.png b/book/source/diag/Primary_key_metadata.png
deleted file mode 100644
index dae4409..0000000
Binary files a/book/source/diag/Primary_key_metadata.png and /dev/null differ
diff --git a/book/source/diag/Signature_Creation.png b/book/source/diag/Signature_Creation.png
deleted file mode 100644
index 69b2fdc..0000000
Binary files a/book/source/diag/Signature_Creation.png and /dev/null differ
diff --git a/book/source/diag/Signature_Verification.png b/book/source/diag/Signature_Verification.png
deleted file mode 100644
index 3f99878..0000000
Binary files a/book/source/diag/Signature_Verification.png and /dev/null differ
diff --git a/book/source/diag/TSK.png b/book/source/diag/TSK.png
deleted file mode 100644
index 361e350..0000000
Binary files a/book/source/diag/TSK.png and /dev/null differ
diff --git a/book/source/diag/asymmetric_keypair.png b/book/source/diag/asymmetric_keypair.png
deleted file mode 100644
index 088b3c4..0000000
Binary files a/book/source/diag/asymmetric_keypair.png and /dev/null differ
diff --git a/book/source/diag/certificate_packet_list.png b/book/source/diag/certificate_packet_list.png
deleted file mode 100644
index 283c86a..0000000
Binary files a/book/source/diag/certificate_packet_list.png and /dev/null differ
diff --git a/book/source/diag/cryptographic_keypair.png b/book/source/diag/cryptographic_keypair.png
deleted file mode 100644
index d57a320..0000000
Binary files a/book/source/diag/cryptographic_keypair.png and /dev/null differ
diff --git a/book/source/diag/cryptographic_signature.png b/book/source/diag/cryptographic_signature.png
deleted file mode 100644
index d5ee4bf..0000000
Binary files a/book/source/diag/cryptographic_signature.png and /dev/null differ
diff --git a/book/source/diag/diag_library_draft.svg b/book/source/diag/diag_library_draft.svg
index ad830b5..6d8a3ac 100644
--- a/book/source/diag/diag_library_draft.svg
+++ b/book/source/diag/diag_library_draft.svg
@@ -9771,8 +9771,8 @@
      inkscape:deskcolor="#d1d1d1"
      inkscape:lockguides="false"
      inkscape:zoom="0.5"
-     inkscape:cx="2091"
-     inkscape:cy="-1085"
+     inkscape:cx="1325"
+     inkscape:cy="-2391"
      inkscape:window-width="2560"
      inkscape:window-height="1371"
      inkscape:window-x="0"
@@ -9994,7 +9994,7 @@
        id="page194"
        margin="0"
        bleed="0"
-       inkscape:export-filename="cryptographic_signature.png"
+       inkscape:export-filename="cryptographic_signature.svg"
        inkscape:export-xdpi="94.510002"
        inkscape:export-ydpi="94.510002" /><inkscape:page
        x="2435.957"
@@ -10037,10 +10037,7 @@
        height="323.06079"
        id="page7"
        margin="0"
-       bleed="0"
-       inkscape:export-filename="OpenPGP_Certificate_packet_2.svg"
-       inkscape:export-xdpi="94.510002"
-       inkscape:export-ydpi="94.510002" /><inkscape:page
+       bleed="0" /><inkscape:page
        x="2440.9629"
        y="-1807.802"
        width="661.15527"
diff --git a/book/source/diag/direct_key_signature_packet.png b/book/source/diag/direct_key_signature_packet.png
deleted file mode 100644
index 73875a1..0000000
Binary files a/book/source/diag/direct_key_signature_packet.png and /dev/null differ
diff --git a/book/source/diag/meaning_of_signatures.png b/book/source/diag/meaning_of_signatures.png
deleted file mode 100644
index 7fd595b..0000000
Binary files a/book/source/diag/meaning_of_signatures.png and /dev/null differ
diff --git a/book/source/diag/passphrase_using_S2K.png b/book/source/diag/passphrase_using_S2K.png
deleted file mode 100644
index 2607feb..0000000
Binary files a/book/source/diag/passphrase_using_S2K.png and /dev/null differ
diff --git a/book/source/diag/public-key_packet.png b/book/source/diag/public-key_packet.png
deleted file mode 100644
index df31ed3..0000000
Binary files a/book/source/diag/public-key_packet.png and /dev/null differ
diff --git a/book/source/diag/public_key.png b/book/source/diag/public_key.png
deleted file mode 100644
index ff548d8..0000000
Binary files a/book/source/diag/public_key.png and /dev/null differ
diff --git a/book/source/diag/secret-key_packet.png b/book/source/diag/secret-key_packet.png
deleted file mode 100644
index b1ad0f9..0000000
Binary files a/book/source/diag/secret-key_packet.png and /dev/null differ
diff --git a/book/source/diag/subkey_binding_signatur_for_signing_sk.png b/book/source/diag/subkey_binding_signatur_for_signing_sk.png
deleted file mode 100644
index d4cc751..0000000
Binary files a/book/source/diag/subkey_binding_signatur_for_signing_sk.png and /dev/null differ
diff --git a/book/source/diag/subkey_binding_signature.png b/book/source/diag/subkey_binding_signature.png
deleted file mode 100644
index 0a68fd5..0000000
Binary files a/book/source/diag/subkey_binding_signature.png and /dev/null differ
diff --git a/book/source/diag/symmetric_key.png b/book/source/diag/symmetric_key.png
deleted file mode 100644
index b8138f9..0000000
Binary files a/book/source/diag/symmetric_key.png and /dev/null differ
diff --git a/book/source/diag/user_id_certification.png b/book/source/diag/user_id_certification.png
deleted file mode 100644
index 1765602..0000000
Binary files a/book/source/diag/user_id_certification.png and /dev/null differ