diff --git a/src/app/tape/dialogs/dialogmdatabase.cpp b/src/app/tape/dialogs/dialogmdatabase.cpp
index 8c2c66c5c..fc6d2c758 100644
--- a/src/app/tape/dialogs/dialogmdatabase.cpp
+++ b/src/app/tape/dialogs/dialogmdatabase.cpp
@@ -414,6 +414,8 @@ QString DialogMDataBase::MapDiagrams(const QString &number) const
         case 18: // A19
             V_FALLTHROUGH
         case 19: // A20
+            V_FALLTHROUGH
+        case 20: // A21
             return QString("Ap2");
         default:
             break;
@@ -576,13 +578,13 @@ QString DialogMDataBase::MapDiagrams(const QString &number) const
         case 12: // E13
             V_FALLTHROUGH
         case 13: // E14
-            return QString("Ep5");
+            V_FALLTHROUGH
         case 14: // E15
             V_FALLTHROUGH
         case 15: // E16
-            V_FALLTHROUGH
+            return QString("Ep5");
         case 16: // E17
-            return QString("Ep6");
+            V_FALLTHROUGH
         case 17: // E18
             V_FALLTHROUGH
         case 18: // E19
@@ -590,39 +592,45 @@ QString DialogMDataBase::MapDiagrams(const QString &number) const
         case 19: // E20
             V_FALLTHROUGH
         case 20: // E21
-            return QString("Ep7");
+            return QString("Ep6");
         case 21: // E22
             V_FALLTHROUGH
         case 22: // E23
             V_FALLTHROUGH
         case 23: // E24
-            return QString("Ep8");
-        case 24: // E25
             V_FALLTHROUGH
+        case 24: // E25
+            return QString("Ep7");
         case 25: // E26
             V_FALLTHROUGH
         case 26: // E27
-            return QString("Ep9");
+            V_FALLTHROUGH
         case 27: // E28
             V_FALLTHROUGH
         case 28: // E29
-            V_FALLTHROUGH
+            return QString("Ep8");
         case 29: // E30
-            return QString("Ep10");
+            V_FALLTHROUGH
         case 30: // E31
             V_FALLTHROUGH
         case 31: // E32
-            V_FALLTHROUGH
+            return QString("Ep9");
         case 32: // E33
             V_FALLTHROUGH
         case 33: // E34
-            return QString("Ep11");
+            V_FALLTHROUGH
         case 34: // E35
-            return QString("Ep12");
+            return QString("Ep10");
         case 35: // E36
-            return QString("Ep13");
+            V_FALLTHROUGH
         case 36: // E37
-            return QString("Ep14");
+            V_FALLTHROUGH
+        case 37: // E38
+            V_FALLTHROUGH
+        case 38: // E39
+            return QString("Ep11");
+        case 39: // E40
+            return QString("Ep12");
         default:
             break;
     }
@@ -712,6 +720,8 @@ QString DialogMDataBase::MapDiagrams(const QString &number) const
             return QString("Hp9");
         case 11: // H12
             return QString("Hp10");
+        case 12: // H13
+            return QString("Hp11");
         default:
             break;
     }
diff --git a/src/app/tape/share/resources/diagrams.qrc b/src/app/tape/share/resources/diagrams.qrc
index f0ffe8ba4..41bec3cea 100644
--- a/src/app/tape/share/resources/diagrams.qrc
+++ b/src/app/tape/share/resources/diagrams.qrc
@@ -1,103 +1,102 @@
 <RCC>
     <qresource prefix="/">
-        <file>diagrams/Ap1.png</file> 
-        <file>diagrams/Ap2.png</file> 
-        <file>diagrams/Bp1.png</file> 
-        <file>diagrams/Bp2.png</file> 
-        <file>diagrams/Cp1.png</file> 
-        <file>diagrams/Cp2.png</file> 
-        <file>diagrams/Dp1.png</file> 
-        <file>diagrams/Dp2.png</file> 
-        <file>diagrams/Dp3.png</file> 
-        <file>diagrams/Dp4.png</file> 
-        <file>diagrams/Dp5.png</file> 
-        <file>diagrams/Dp6.png</file> 
-        <file>diagrams/Dp7.png</file> 
-        <file>diagrams/Dp8.png</file> 
-        <file>diagrams/Ep1.png</file> 
-        <file>diagrams/Ep2.png</file> 
-        <file>diagrams/Ep3.png</file> 
-        <file>diagrams/Ep4.png</file> 
-        <file>diagrams/Ep5.png</file> 
-        <file>diagrams/Ep6.png</file> 
-        <file>diagrams/Ep7.png</file> 
-        <file>diagrams/Ep8.png</file> 
-        <file>diagrams/Ep9.png</file> 
-        <file>diagrams/Ep10.png</file> 
-        <file>diagrams/Ep11.png</file> 
-        <file>diagrams/Ep12.png</file> 
-        <file>diagrams/Ep13.png</file> 
-        <file>diagrams/Ep14.png</file> 
-        <file>diagrams/Fp1.png</file> 
-        <file>diagrams/Fp2.png</file> 
-        <file>diagrams/Fp3.png</file> 
-        <file>diagrams/Fp4.png</file> 
-        <file>diagrams/Fp5.png</file> 
-        <file>diagrams/Fp6.png</file> 
-        <file>diagrams/Fp7.png</file> 
+        <file>diagrams/Ap1.png</file>
+        <file>diagrams/Ap2.png</file>
+        <file>diagrams/Bp1.png</file>
+        <file>diagrams/Bp2.png</file>
+        <file>diagrams/Cp1.png</file>
+        <file>diagrams/Cp2.png</file>
+        <file>diagrams/Dp1.png</file>
+        <file>diagrams/Dp2.png</file>
+        <file>diagrams/Dp3.png</file>
+        <file>diagrams/Dp4.png</file>
+        <file>diagrams/Dp5.png</file>
+        <file>diagrams/Dp6.png</file>
+        <file>diagrams/Dp7.png</file>
+        <file>diagrams/Dp8.png</file>
+        <file>diagrams/Ep1.png</file>
+        <file>diagrams/Ep2.png</file>
+        <file>diagrams/Ep3.png</file>
+        <file>diagrams/Ep4.png</file>
+        <file>diagrams/Ep5.png</file>
+        <file>diagrams/Ep6.png</file>
+        <file>diagrams/Ep7.png</file>
+        <file>diagrams/Ep8.png</file>
+        <file>diagrams/Ep9.png</file>
+        <file>diagrams/Ep10.png</file>
+        <file>diagrams/Ep11.png</file>
+        <file>diagrams/Ep12.png</file>
+        <file>diagrams/Fp1.png</file>
+        <file>diagrams/Fp2.png</file>
+        <file>diagrams/Fp3.png</file>
+        <file>diagrams/Fp4.png</file>
+        <file>diagrams/Fp5.png</file>
+        <file>diagrams/Fp6.png</file>
+        <file>diagrams/Fp7.png</file>
         <file>diagrams/Gp1.png</file>
-        <file>diagrams/Gp2.png</file> 
-        <file>diagrams/Gp3.png</file> 
-        <file>diagrams/Gp4.png</file> 
-        <file>diagrams/Hp1.png</file> 
-        <file>diagrams/Hp2.png</file> 
-        <file>diagrams/Hp3.png</file> 
-        <file>diagrams/Hp4.png</file> 
-        <file>diagrams/Hp5.png</file> 
-        <file>diagrams/Hp6.png</file> 
-        <file>diagrams/Hp7.png</file> 
-        <file>diagrams/Hp8.png</file> 
-        <file>diagrams/Hp9.png</file> 
-        <file>diagrams/Hp10.png</file> 
-        <file>diagrams/Ip1.png</file> 
-        <file>diagrams/Ip2.png</file> 
-        <file>diagrams/Ip3.png</file> 
-        <file>diagrams/Ip4.png</file> 
-        <file>diagrams/Ip5.png</file> 
-        <file>diagrams/Ip6.png</file> 
-        <file>diagrams/Ip7.png</file> 
-        <file>diagrams/Ip8.png</file> 
-        <file>diagrams/Ip9.png</file> 
-        <file>diagrams/Jp1.png</file> 
+        <file>diagrams/Gp2.png</file>
+        <file>diagrams/Gp3.png</file>
+        <file>diagrams/Gp4.png</file>
+        <file>diagrams/Hp1.png</file>
+        <file>diagrams/Hp2.png</file>
+        <file>diagrams/Hp3.png</file>
+        <file>diagrams/Hp4.png</file>
+        <file>diagrams/Hp5.png</file>
+        <file>diagrams/Hp6.png</file>
+        <file>diagrams/Hp7.png</file>
+        <file>diagrams/Hp8.png</file>
+        <file>diagrams/Hp9.png</file>
+        <file>diagrams/Hp10.png</file>
+        <file>diagrams/Hp11.png</file>
+        <file>diagrams/Ip1.png</file>
+        <file>diagrams/Ip2.png</file>
+        <file>diagrams/Ip3.png</file>
+        <file>diagrams/Ip4.png</file>
+        <file>diagrams/Ip5.png</file>
+        <file>diagrams/Ip6.png</file>
+        <file>diagrams/Ip7.png</file>
+        <file>diagrams/Ip8.png</file>
+        <file>diagrams/Ip9.png</file>
+        <file>diagrams/Jp1.png</file>
         <file>diagrams/Jp2.png</file>
-        <file>diagrams/Jp3.png</file> 
-        <file>diagrams/Kp1.png</file> 
-        <file>diagrams/Kp2.png</file> 
-        <file>diagrams/Kp3.png</file> 
-        <file>diagrams/Kp4.png</file> 
-        <file>diagrams/Lp1.png</file> 
-        <file>diagrams/Lp2.png</file> 
-        <file>diagrams/Lp3.png</file> 
-        <file>diagrams/Mp1.png</file> 
-        <file>diagrams/Mp2.png</file> 
-        <file>diagrams/Np1.png</file> 
-        <file>diagrams/Np2.png</file> 
-        <file>diagrams/Np3.png</file> 
-        <file>diagrams/Op1.png</file> 
-        <file>diagrams/Op2.png</file> 
-        <file>diagrams/Op3.png</file> 
-        <file>diagrams/Op4.png</file> 
-        <file>diagrams/Op5.png</file> 
-        <file>diagrams/Op6.png</file> 
-        <file>diagrams/Op7.png</file> 
-        <file>diagrams/Op8.png</file> 
-        <file>diagrams/Op9.png</file> 
-        <file>diagrams/Op10.png</file> 
-        <file>diagrams/Op11.png</file> 
-        <file>diagrams/Pp1.png</file> 
-        <file>diagrams/Pp2.png</file> 
-        <file>diagrams/Pp3.png</file> 
-        <file>diagrams/Pp4.png</file> 
-        <file>diagrams/Pp5.png</file> 
-        <file>diagrams/Pp6.png</file> 
-        <file>diagrams/Pp7.png</file> 
-        <file>diagrams/Pp8.png</file> 
-        <file>diagrams/Pp9.png</file> 
-        <file>diagrams/Pp10.png</file> 
-        <file>diagrams/Pp11.png</file> 
-        <file>diagrams/Pp12.png</file> 
-        <file>diagrams/Qp1.png</file> 
-        <file>diagrams/Qp2.png</file> 
-        <file>diagrams/Qp3.png</file> 
+        <file>diagrams/Jp3.png</file>
+        <file>diagrams/Kp1.png</file>
+        <file>diagrams/Kp2.png</file>
+        <file>diagrams/Kp3.png</file>
+        <file>diagrams/Kp4.png</file>
+        <file>diagrams/Lp1.png</file>
+        <file>diagrams/Lp2.png</file>
+        <file>diagrams/Lp3.png</file>
+        <file>diagrams/Mp1.png</file>
+        <file>diagrams/Mp2.png</file>
+        <file>diagrams/Np1.png</file>
+        <file>diagrams/Np2.png</file>
+        <file>diagrams/Np3.png</file>
+        <file>diagrams/Op1.png</file>
+        <file>diagrams/Op2.png</file>
+        <file>diagrams/Op3.png</file>
+        <file>diagrams/Op4.png</file>
+        <file>diagrams/Op5.png</file>
+        <file>diagrams/Op6.png</file>
+        <file>diagrams/Op7.png</file>
+        <file>diagrams/Op8.png</file>
+        <file>diagrams/Op9.png</file>
+        <file>diagrams/Op10.png</file>
+        <file>diagrams/Op11.png</file>
+        <file>diagrams/Pp1.png</file>
+        <file>diagrams/Pp2.png</file>
+        <file>diagrams/Pp3.png</file>
+        <file>diagrams/Pp4.png</file>
+        <file>diagrams/Pp5.png</file>
+        <file>diagrams/Pp6.png</file>
+        <file>diagrams/Pp7.png</file>
+        <file>diagrams/Pp8.png</file>
+        <file>diagrams/Pp9.png</file>
+        <file>diagrams/Pp10.png</file>
+        <file>diagrams/Pp11.png</file>
+        <file>diagrams/Pp12.png</file>
+        <file>diagrams/Qp1.png</file>
+        <file>diagrams/Qp2.png</file>
+        <file>diagrams/Qp3.png</file>
     </qresource>
 </RCC>
diff --git a/src/app/tape/share/resources/diagrams/Ap2.png b/src/app/tape/share/resources/diagrams/Ap2.png
index dda687d06..f7d257d16 100644
Binary files a/src/app/tape/share/resources/diagrams/Ap2.png and b/src/app/tape/share/resources/diagrams/Ap2.png differ
diff --git a/src/app/tape/share/resources/diagrams/Ep10.png b/src/app/tape/share/resources/diagrams/Ep10.png
index 651c6ea8c..c37724950 100644
Binary files a/src/app/tape/share/resources/diagrams/Ep10.png and b/src/app/tape/share/resources/diagrams/Ep10.png differ
diff --git a/src/app/tape/share/resources/diagrams/Ep11.png b/src/app/tape/share/resources/diagrams/Ep11.png
index 4be828450..d91669773 100644
Binary files a/src/app/tape/share/resources/diagrams/Ep11.png and b/src/app/tape/share/resources/diagrams/Ep11.png differ
diff --git a/src/app/tape/share/resources/diagrams/Ep12.png b/src/app/tape/share/resources/diagrams/Ep12.png
index cdeac3e71..050df75f1 100644
Binary files a/src/app/tape/share/resources/diagrams/Ep12.png and b/src/app/tape/share/resources/diagrams/Ep12.png differ
diff --git a/src/app/tape/share/resources/diagrams/Ep13.png b/src/app/tape/share/resources/diagrams/Ep13.png
deleted file mode 100644
index 6f93ba26a..000000000
Binary files a/src/app/tape/share/resources/diagrams/Ep13.png and /dev/null differ
diff --git a/src/app/tape/share/resources/diagrams/Ep14.png b/src/app/tape/share/resources/diagrams/Ep14.png
deleted file mode 100644
index 54baa36a6..000000000
Binary files a/src/app/tape/share/resources/diagrams/Ep14.png and /dev/null differ
diff --git a/src/app/tape/share/resources/diagrams/Ep5.png b/src/app/tape/share/resources/diagrams/Ep5.png
index 2b3bade69..a95e780f2 100644
Binary files a/src/app/tape/share/resources/diagrams/Ep5.png and b/src/app/tape/share/resources/diagrams/Ep5.png differ
diff --git a/src/app/tape/share/resources/diagrams/Ep6.png b/src/app/tape/share/resources/diagrams/Ep6.png
index a09955153..22651b917 100644
Binary files a/src/app/tape/share/resources/diagrams/Ep6.png and b/src/app/tape/share/resources/diagrams/Ep6.png differ
diff --git a/src/app/tape/share/resources/diagrams/Ep7.png b/src/app/tape/share/resources/diagrams/Ep7.png
index 5b34ffd66..122eb31d9 100644
Binary files a/src/app/tape/share/resources/diagrams/Ep7.png and b/src/app/tape/share/resources/diagrams/Ep7.png differ
diff --git a/src/app/tape/share/resources/diagrams/Ep8.png b/src/app/tape/share/resources/diagrams/Ep8.png
index 09896ccbe..fc738dd09 100644
Binary files a/src/app/tape/share/resources/diagrams/Ep8.png and b/src/app/tape/share/resources/diagrams/Ep8.png differ
diff --git a/src/app/tape/share/resources/diagrams/Ep9.png b/src/app/tape/share/resources/diagrams/Ep9.png
index ac4f89990..d8384507a 100644
Binary files a/src/app/tape/share/resources/diagrams/Ep9.png and b/src/app/tape/share/resources/diagrams/Ep9.png differ
diff --git a/src/app/tape/share/resources/diagrams/Hp11.png b/src/app/tape/share/resources/diagrams/Hp11.png
new file mode 100644
index 000000000..96cf33850
Binary files /dev/null and b/src/app/tape/share/resources/diagrams/Hp11.png differ
diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro
index de155d047..add8c4fdc 100644
--- a/src/app/tape/tape.pro
+++ b/src/app/tape/tape.pro
@@ -263,8 +263,6 @@ DIAGRAMS += \
         $${PWD}/share/resources/diagrams/Ep10.png \
         $${PWD}/share/resources/diagrams/Ep11.png \
         $${PWD}/share/resources/diagrams/Ep12.png \
-        $${PWD}/share/resources/diagrams/Ep13.png \
-        $${PWD}/share/resources/diagrams/Ep14.png \
         $${PWD}/share/resources/diagrams/Fp1.png \
         $${PWD}/share/resources/diagrams/Fp2.png \
         $${PWD}/share/resources/diagrams/Fp3.png \
@@ -286,6 +284,7 @@ DIAGRAMS += \
         $${PWD}/share/resources/diagrams/Hp8.png \
         $${PWD}/share/resources/diagrams/Hp9.png \
         $${PWD}/share/resources/diagrams/Hp10.png \
+        $${PWD}/share/resources/diagrams/Hp11.png \
         $${PWD}/share/resources/diagrams/Ip1.png \
         $${PWD}/share/resources/diagrams/Ip2.png \
         $${PWD}/share/resources/diagrams/Ip3.png \