diff --git a/src/app/tape/dialogs/dialogmdatabase.cpp b/src/app/tape/dialogs/dialogmdatabase.cpp
index fc6d2c758..a6817272c 100644
--- a/src/app/tape/dialogs/dialogmdatabase.cpp
+++ b/src/app/tape/dialogs/dialogmdatabase.cpp
@@ -408,7 +408,7 @@ QString DialogMDataBase::MapDiagrams(const QString &number) const
         case 15: // A16
             V_FALLTHROUGH
         case 16: // A17
-            return QString("Ap1");
+            return QStringLiteral("Ap1");
         case 17: // A18
             V_FALLTHROUGH
         case 18: // A19
@@ -416,7 +416,9 @@ QString DialogMDataBase::MapDiagrams(const QString &number) const
         case 19: // A20
             V_FALLTHROUGH
         case 20: // A21
-            return QString("Ap2");
+            V_FALLTHROUGH
+        case 21: // A22
+            return QStringLiteral("Ap2");
         default:
             break;
     }
@@ -431,9 +433,9 @@ QString DialogMDataBase::MapDiagrams(const QString &number) const
         case 2: // B03
             V_FALLTHROUGH
         case 3: // B04
-            return QString("Bp1");
+            return QStringLiteral("Bp1");
         case 4: // B05
-            return QString("Bp2");
+            return QStringLiteral("Bp2");
         default:
             break;
     }
@@ -442,11 +444,11 @@ QString DialogMDataBase::MapDiagrams(const QString &number) const
     {
         // C
         case 0: // C01
-            return QString("Cp1");
+            return QStringLiteral("Cp1");
         case 1: // C02
             V_FALLTHROUGH
         case 2: // C03
-            return QString("Cp2");
+            return QStringLiteral("Cp2");
         default:
             break;
     }
@@ -459,91 +461,11 @@ QString DialogMDataBase::MapDiagrams(const QString &number) const
         case 1: // D02
             V_FALLTHROUGH
         case 2: // D03
-            V_FALLTHROUGH
+            return QStringLiteral("Dp1");
         case 3: // D04
-            V_FALLTHROUGH
+            return QStringLiteral("Dp2");
         case 4: // D05
-            V_FALLTHROUGH
-        case 5: // D06
-            V_FALLTHROUGH
-        case 6: // D07
-            V_FALLTHROUGH
-        case 7: // D08
-            V_FALLTHROUGH
-        case 8: // D09
-            return QString("Dp1");
-        case 9: // D10
-            V_FALLTHROUGH
-        case 10: // D11
-            V_FALLTHROUGH
-        case 11: // D12
-            V_FALLTHROUGH
-        case 12: // D13
-            V_FALLTHROUGH
-        case 13: // D14
-            V_FALLTHROUGH
-        case 14: // D15
-            V_FALLTHROUGH
-        case 15: // D16
-            V_FALLTHROUGH
-        case 16: // D17
-            return QString("Dp2");
-        case 17: // D18
-            V_FALLTHROUGH
-        case 18: // D19
-            V_FALLTHROUGH
-        case 19: // D20
-            V_FALLTHROUGH
-        case 20: // D21
-            V_FALLTHROUGH
-        case 21: // D22
-            V_FALLTHROUGH
-        case 22: // D23
-            V_FALLTHROUGH
-        case 23: // D24
-            V_FALLTHROUGH
-        case 24: // D25
-            return QString("Dp3");
-        case 25: // D26
-            V_FALLTHROUGH
-        case 26: // D27
-            V_FALLTHROUGH
-        case 27: // D28
-            V_FALLTHROUGH
-        case 28: // D29
-            V_FALLTHROUGH
-        case 29: // D30
-            V_FALLTHROUGH
-        case 30: // D31
-            V_FALLTHROUGH
-        case 31: // D32
-            V_FALLTHROUGH
-        case 32: // D33
-            return QString("Dp4");
-        case 33: // D34
-            V_FALLTHROUGH
-        case 34: // D35
-            V_FALLTHROUGH
-        case 35: // D36
-            V_FALLTHROUGH
-        case 36: // D37
-            V_FALLTHROUGH
-        case 37: // D38
-            V_FALLTHROUGH
-        case 38: // D39
-            V_FALLTHROUGH
-        case 39: // D40
-            V_FALLTHROUGH
-        case 40: // D41
-            return QString("Dp5");
-        case 41: // D42
-            return QString("Dp6");
-        case 42: // D43
-            V_FALLTHROUGH
-        case 43: // D44
-            return QString("Dp7");
-        case 44: // D45
-            return QString("Dp8");
+            return QStringLiteral("Dp3");
         default:
             break;
     }
@@ -552,85 +474,13 @@ QString DialogMDataBase::MapDiagrams(const QString &number) const
     {
         // E
         case 0: // E01
-            return QString("Ep1");
+            return QStringLiteral("Ep1");
         case 1: // E02
-            return QString("Ep2");
+            V_FALLTHROUGH
         case 2: // E03
             V_FALLTHROUGH
         case 3: // E04
-            V_FALLTHROUGH
-        case 4: // E05
-            V_FALLTHROUGH
-        case 5: // E06
-            return QString("Ep3");
-        case 6: // E07
-            V_FALLTHROUGH
-        case 7: // E08
-            V_FALLTHROUGH
-        case 8: // E09
-            V_FALLTHROUGH
-        case 9: // E10
-            return QString("Ep4");
-        case 10: // E11
-            V_FALLTHROUGH
-        case 11: // E12
-            V_FALLTHROUGH
-        case 12: // E13
-            V_FALLTHROUGH
-        case 13: // E14
-            V_FALLTHROUGH
-        case 14: // E15
-            V_FALLTHROUGH
-        case 15: // E16
-            return QString("Ep5");
-        case 16: // E17
-            V_FALLTHROUGH
-        case 17: // E18
-            V_FALLTHROUGH
-        case 18: // E19
-            V_FALLTHROUGH
-        case 19: // E20
-            V_FALLTHROUGH
-        case 20: // E21
-            return QString("Ep6");
-        case 21: // E22
-            V_FALLTHROUGH
-        case 22: // E23
-            V_FALLTHROUGH
-        case 23: // E24
-            V_FALLTHROUGH
-        case 24: // E25
-            return QString("Ep7");
-        case 25: // E26
-            V_FALLTHROUGH
-        case 26: // E27
-            V_FALLTHROUGH
-        case 27: // E28
-            V_FALLTHROUGH
-        case 28: // E29
-            return QString("Ep8");
-        case 29: // E30
-            V_FALLTHROUGH
-        case 30: // E31
-            V_FALLTHROUGH
-        case 31: // E32
-            return QString("Ep9");
-        case 32: // E33
-            V_FALLTHROUGH
-        case 33: // E34
-            V_FALLTHROUGH
-        case 34: // E35
-            return QString("Ep10");
-        case 35: // E36
-            V_FALLTHROUGH
-        case 36: // E37
-            V_FALLTHROUGH
-        case 37: // E38
-            V_FALLTHROUGH
-        case 38: // E39
-            return QString("Ep11");
-        case 39: // E40
-            return QString("Ep12");
+            return QStringLiteral("Ep2");
         default:
             break;
     }
@@ -643,29 +493,13 @@ QString DialogMDataBase::MapDiagrams(const QString &number) const
         case 1: // F02
             V_FALLTHROUGH
         case 2: // F03
-            V_FALLTHROUGH
+            return QStringLiteral("Fp1");
         case 3: // F04
-            return QString("Fp1");
+            return QStringLiteral("Fp2");
         case 4: // F05
             V_FALLTHROUGH
         case 5: // F06
-            V_FALLTHROUGH
-        case 6: // F07
-            return QString("Fp2");
-        case 7: // F08
-            V_FALLTHROUGH
-        case 8: // F09
-            return QString("Fp3");
-        case 9: // F10
-            V_FALLTHROUGH
-        case 10: // F11
-            return QString("Fp4");
-        case 11: // F12
-            return QString("Fp5");
-        case 12: // F13
-            return QString("Fp6");
-        case 13: // F14
-            return QString("Fp7");
+            return QStringLiteral("Fp3");
         default:
             break;
     }
@@ -680,15 +514,89 @@ QString DialogMDataBase::MapDiagrams(const QString &number) const
         case 2: // G03
             V_FALLTHROUGH
         case 3: // G04
-            return QString("Gp1");
+            V_FALLTHROUGH
         case 4: // G05
-            return QString("Gp2");
+            V_FALLTHROUGH
         case 5: // G06
-            return QString("Gp3");
+            V_FALLTHROUGH
         case 6: // G07
             V_FALLTHROUGH
         case 7: // G08
-            return QString("Gp4");
+            V_FALLTHROUGH
+        case 8: // G09
+            return QStringLiteral("Gp1");
+        case 9: // G10
+            V_FALLTHROUGH
+        case 10: // G11
+            V_FALLTHROUGH
+        case 11: // G12
+            V_FALLTHROUGH
+        case 12: // G13
+            V_FALLTHROUGH
+        case 13: // G14
+            V_FALLTHROUGH
+        case 14: // G15
+            V_FALLTHROUGH
+        case 15: // G16
+            V_FALLTHROUGH
+        case 16: // G17
+            return QStringLiteral("Gp2");
+        case 17: // G18
+            V_FALLTHROUGH
+        case 18: // G19
+            V_FALLTHROUGH
+        case 19: // G20
+            V_FALLTHROUGH
+        case 20: // G21
+            V_FALLTHROUGH
+        case 21: // G22
+            V_FALLTHROUGH
+        case 22: // G23
+            V_FALLTHROUGH
+        case 23: // G24
+            V_FALLTHROUGH
+        case 24: // G25
+            return QStringLiteral("Gp3");
+        case 25: // G26
+            V_FALLTHROUGH
+        case 26: // G27
+            V_FALLTHROUGH
+        case 27: // G28
+            V_FALLTHROUGH
+        case 28: // G29
+            V_FALLTHROUGH
+        case 29: // G30
+            V_FALLTHROUGH
+        case 30: // G31
+            V_FALLTHROUGH
+        case 31: // G32
+            V_FALLTHROUGH
+        case 32: // G33
+            return QStringLiteral("Gp4");
+        case 33: // G34
+            V_FALLTHROUGH
+        case 34: // G35
+            V_FALLTHROUGH
+        case 35: // G36
+            V_FALLTHROUGH
+        case 36: // G37
+            V_FALLTHROUGH
+        case 37: // G38
+            V_FALLTHROUGH
+        case 38: // G39
+            V_FALLTHROUGH
+        case 39: // G40
+            V_FALLTHROUGH
+        case 40: // G41
+            return QStringLiteral("Gp5");
+        case 41: // G42
+            return QStringLiteral("Gp6");
+        case 42: // G43
+            V_FALLTHROUGH
+        case 43: // G44
+            return QStringLiteral("Gp7");
+        case 44: // G45
+            return QStringLiteral("Gp8");
         default:
             break;
     }
@@ -697,31 +605,85 @@ QString DialogMDataBase::MapDiagrams(const QString &number) const
     {
         // H
         case 0: // H01
-            return QString("Hp1");
+            return QStringLiteral("Hp1");
         case 1: // H02
-            V_FALLTHROUGH
+            return QStringLiteral("Hp2");
         case 2: // H03
-            return QString("Hp2");
+            V_FALLTHROUGH
         case 3: // H04
-            return QString("Hp3");
+            V_FALLTHROUGH
         case 4: // H05
-            return QString("Hp4");
+            V_FALLTHROUGH
         case 5: // H06
-            return QString("Hp5");
+            return QStringLiteral("Hp3");
         case 6: // H07
-            return QString("Hp6");
+            V_FALLTHROUGH
         case 7: // H08
             V_FALLTHROUGH
         case 8: // H09
-            return QString("Hp7");
+            V_FALLTHROUGH
         case 9: // H10
-            return QString("Hp8");
+            V_FALLTHROUGH
         case 10: // H11
-            return QString("Hp9");
+            V_FALLTHROUGH
         case 11: // H12
-            return QString("Hp10");
+            return QStringLiteral("Hp4");
         case 12: // H13
-            return QString("Hp11");
+            V_FALLTHROUGH
+        case 13: // H14
+            V_FALLTHROUGH
+        case 14: // H15
+            V_FALLTHROUGH
+        case 15: // H16
+            return QStringLiteral("Hp5");
+        case 16: // H17
+            V_FALLTHROUGH
+        case 17: // H18
+            V_FALLTHROUGH
+        case 18: // H19
+            V_FALLTHROUGH
+        case 19: // H20
+            return QStringLiteral("Hp6");
+        case 20: // H21
+            V_FALLTHROUGH
+        case 21: // H22
+            V_FALLTHROUGH
+        case 22: // H23
+            V_FALLTHROUGH
+        case 23: // H24
+            V_FALLTHROUGH
+        case 24: // H25
+            return QStringLiteral("Hp7");
+        case 25: // H26
+            V_FALLTHROUGH
+        case 26: // H27
+            V_FALLTHROUGH
+        case 27: // H28
+            V_FALLTHROUGH
+        case 28: // H29
+            return QStringLiteral("Hp8");
+        case 29: // H30
+            V_FALLTHROUGH
+        case 30: // H31
+            V_FALLTHROUGH
+        case 31: // H32
+            return QStringLiteral("Hp9");
+        case 32: // H33
+            V_FALLTHROUGH
+        case 33: // H34
+            V_FALLTHROUGH
+        case 34: // H35
+            return QStringLiteral("Hp10");
+        case 35: // H36
+            V_FALLTHROUGH
+        case 36: // H37
+            V_FALLTHROUGH
+        case 37: // H38
+            V_FALLTHROUGH
+        case 38: // H39
+            return QStringLiteral("Hp11");
+        case 39: // H40
+            return QStringLiteral("Hp12");
         default:
             break;
     }
@@ -736,41 +698,27 @@ QString DialogMDataBase::MapDiagrams(const QString &number) const
         case 2: // I03
             V_FALLTHROUGH
         case 3: // I04
-            return QString("Ip1");
+            return QStringLiteral("Ip1");
         case 4: // I05
             V_FALLTHROUGH
         case 5: // I06
-            V_FALLTHROUGH
+            return QStringLiteral("Ip2");
         case 6: // I07
-            return QString("Ip2");
+            V_FALLTHROUGH
         case 7: // I08
             V_FALLTHROUGH
         case 8: // I09
-            V_FALLTHROUGH
+            return QStringLiteral("Ip3");
         case 9: // I10
-            return QString("Ip3");
+            V_FALLTHROUGH
         case 10: // I11
-            V_FALLTHROUGH
+            return QStringLiteral("Ip4");
         case 11: // I12
-            V_FALLTHROUGH
+            return QStringLiteral("Ip5");
         case 12: // I13
-            V_FALLTHROUGH
+            return QStringLiteral("Ip6");
         case 13: // I14
-            V_FALLTHROUGH
-        case 14: // I15
-            return QString("Ip4");
-        case 15: // I16
-            return QString("Ip5");
-        case 16: // I17
-            V_FALLTHROUGH
-        case 17: // I18
-            return QString("Ip6");
-        case 18: // I19
-            return QString("Ip7");
-        case 19: // I20
-            return QString("Ip8");
-        case 20: // I21
-            return QString("Ip9");
+            return QStringLiteral("Ip7");
         default:
             break;
     }
@@ -783,29 +731,19 @@ QString DialogMDataBase::MapDiagrams(const QString &number) const
         case 1: // J02
             V_FALLTHROUGH
         case 2: // J03
-            return QString("Jp1");
+            V_FALLTHROUGH
         case 3: // J04
-            V_FALLTHROUGH
+            return QStringLiteral("Jp1");
         case 4: // J05
-            V_FALLTHROUGH
+            return QStringLiteral("Jp2");
         case 5: // J06
-            V_FALLTHROUGH
+            return QStringLiteral("Jp3");
         case 6: // J07
             V_FALLTHROUGH
         case 7: // J08
-            V_FALLTHROUGH
+            return QStringLiteral("Jp4");
         case 8: // J09
-            V_FALLTHROUGH
-        case 9: // J10
-            V_FALLTHROUGH
-        case 10: // J11
-            V_FALLTHROUGH
-        case 11: // J12
-            return QString("Jp2");
-        case 12: // J13
-            V_FALLTHROUGH
-        case 13: // J14
-            return QString("Jp3");
+            return QStringLiteral("Jp5");
         default:
             break;
     }
@@ -814,19 +752,31 @@ QString DialogMDataBase::MapDiagrams(const QString &number) const
     {
         // K
         case 0: // K01
-            return QString("Kp1");
+            return QStringLiteral("Kp1");
         case 1: // K02
             V_FALLTHROUGH
         case 2: // K03
-            return QString("Kp2");
+            return QStringLiteral("Kp2");
         case 3: // K04
-            V_FALLTHROUGH
+            return QStringLiteral("Kp3");
         case 4: // K05
-            return QString("Kp3");
+            return QStringLiteral("Kp4");
         case 5: // K06
             V_FALLTHROUGH
         case 6: // K07
-            return QString("Kp4");
+            return QStringLiteral("Kp5");
+        case 7: // K08
+            return QStringLiteral("Kp6");
+        case 8: // K09
+            return QStringLiteral("Kp7");
+        case 9: // K10
+            return QStringLiteral("Kp8");
+        case 10: // K11
+            return QStringLiteral("Kp9");
+        case 11: // K12
+            return QStringLiteral("Kp10");
+        case 12: // K13
+            return QStringLiteral("Kp11");
         default:
             break;
     }
@@ -839,11 +789,43 @@ QString DialogMDataBase::MapDiagrams(const QString &number) const
         case 1: // L02
             V_FALLTHROUGH
         case 2: // L03
-            return QString("Lp1");
+            V_FALLTHROUGH
         case 3: // L04
-            return QString("Lp2");
+            return QStringLiteral("Lp1");
         case 4: // L05
-            return QString("Lp3");
+            V_FALLTHROUGH
+        case 5: // L06
+            V_FALLTHROUGH
+        case 6: // L07
+            return QStringLiteral("Lp2");
+        case 7: // L08
+            V_FALLTHROUGH
+        case 8: // L09
+            V_FALLTHROUGH
+        case 9: // L10
+            return QStringLiteral("Lp3");
+        case 10: // L11
+            V_FALLTHROUGH
+        case 11: // L12
+            V_FALLTHROUGH
+        case 12: // L13
+            V_FALLTHROUGH
+        case 13: // L14
+            V_FALLTHROUGH
+        case 14: // L15
+            return QStringLiteral("Lp4");
+        case 15: // L16
+            return QStringLiteral("Lp5");
+        case 16: // L17
+            return QStringLiteral("Lp6");
+        case 17: // L18
+            return QStringLiteral("Lp7");
+        case 18: // L19
+            V_FALLTHROUGH
+        case 19: // L20
+            return QStringLiteral("Lp8");
+        case 20: // L21
+            return QStringLiteral("Lp9");
         default:
             break;
     }
@@ -852,13 +834,33 @@ QString DialogMDataBase::MapDiagrams(const QString &number) const
     {
         // M
         case 0: // M01
-            return QString("Mp1");
-        case 1: // M02
             V_FALLTHROUGH
+        case 1: // M02
+            return QStringLiteral("Mp1");
         case 2: // M03
             V_FALLTHROUGH
         case 3: // M04
-            return QString("Mp2");
+            V_FALLTHROUGH
+        case 4: // M05
+            V_FALLTHROUGH
+        case 5: // M06
+            V_FALLTHROUGH
+        case 6: // M07
+            V_FALLTHROUGH
+        case 7: // M08
+            V_FALLTHROUGH
+        case 8: // M09
+            V_FALLTHROUGH
+        case 9: // M10
+            V_FALLTHROUGH
+        case 10: // M11
+            return QStringLiteral("Mp2");
+        case 11: // M12
+            V_FALLTHROUGH
+        case 12: // M13
+            V_FALLTHROUGH
+        case 13: // M14
+            return QStringLiteral("Mp3");
         default:
             break;
     }
@@ -867,17 +869,19 @@ QString DialogMDataBase::MapDiagrams(const QString &number) const
     {
         // N
         case 0: // N01
-            V_FALLTHROUGH
+            return QStringLiteral("Np1");
         case 1: // N02
             V_FALLTHROUGH
         case 2: // N03
-            return QString("Np1");
+            return QStringLiteral("Np2");
         case 3: // N04
-            return QString("Np2");
-        case 4: // N05
             V_FALLTHROUGH
+        case 4: // N05
+            return QStringLiteral("Np3");
         case 5: // N06
-            return QString("Np3");
+            V_FALLTHROUGH
+        case 6: // N07
+            return QStringLiteral("Np4");
         default:
             break;
     }
@@ -886,33 +890,33 @@ QString DialogMDataBase::MapDiagrams(const QString &number) const
     {
         // O
         case 0: // O01
-            return QString("Op1");
+            return QStringLiteral("Op1");
         case 1: // O02
-            return QString("Op2");
+            return QStringLiteral("Op2");
         case 2: // O03
-            return QString("Op3");
+            return QStringLiteral("Op3");
         case 3: // O04
-            return QString("Op4");
+            return QStringLiteral("Op4");
         case 4: // O05
-            return QString("Op5");
+            return QStringLiteral("Op5");
         case 5: // O06
-            return QString("Op6");
+            return QStringLiteral("Op6");
         case 6: // O07
-            return QString("Op7");
+            return QStringLiteral("Op7");
         case 7: // O08
             V_FALLTHROUGH
         case 8: // O09
-            return QString("Op8");
+            return QStringLiteral("Op8");
         case 9: // O10
             V_FALLTHROUGH
         case 10: // O11
-            return QString("Op9");
+            return QStringLiteral("Op9");
         case 11: // O12
             V_FALLTHROUGH
         case 12: // O13
-            return QString("Op10");
+            return QStringLiteral("Op10");
         case 13: // O14
-            return QString("Op11");
+            return QStringLiteral("Op11");
         default:
             break;
     }
@@ -921,29 +925,29 @@ QString DialogMDataBase::MapDiagrams(const QString &number) const
     {
         // P
         case 0: // P01
-            return QString("Pp1");
+            return QStringLiteral("Pp1");
         case 1: // P02
-            return QString("Pp2");
+            return QStringLiteral("Pp2");
         case 2: // P03
-            return QString("Pp3");
+            return QStringLiteral("Pp3");
         case 3: // P04
-            return QString("Pp4");
+            return QStringLiteral("Pp4");
         case 4: // P05
-            return QString("Pp5");
+            return QStringLiteral("Pp5");
         case 5: // P06
-            return QString("Pp6");
+            return QStringLiteral("Pp6");
         case 6: // P07
-            return QString("Pp7");
+            return QStringLiteral("Pp7");
         case 7: // P08
-            return QString("Pp8");
+            return QStringLiteral("Pp8");
         case 8: // P09
-            return QString("Pp9");
+            return QStringLiteral("Pp9");
         case 9: // P10
-            return QString("Pp10");
+            return QStringLiteral("Pp10");
         case 10: // P11
-            return QString("Pp11");
+            return QStringLiteral("Pp11");
         case 11: // P12
-            return QString("Pp12");
+            return QStringLiteral("Pp12");
         default:
             break;
     }
@@ -952,11 +956,11 @@ QString DialogMDataBase::MapDiagrams(const QString &number) const
     {
         // Q
         case 0: // Q01
-            return QString("Qp1");
+            return QStringLiteral("Qp1");
         case 1: // Q02
-            return QString("Qp2");
+            return QStringLiteral("Qp2");
         case 2: // Q03
-            return QString("Qp3");
+            return QStringLiteral("Qp3");
         default:
             break;
     }
diff --git a/src/app/tape/share/resources/diagrams.qrc b/src/app/tape/share/resources/diagrams.qrc
index 41bec3cea..a12f6afa4 100644
--- a/src/app/tape/share/resources/diagrams.qrc
+++ b/src/app/tape/share/resources/diagrams.qrc
@@ -9,34 +9,19 @@
         <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/Gp5.png</file>
+        <file>diagrams/Gp6.png</file>
+        <file>diagrams/Gp7.png</file>
+        <file>diagrams/Gp8.png</file>
         <file>diagrams/Hp1.png</file>
         <file>diagrams/Hp2.png</file>
         <file>diagrams/Hp3.png</file>
@@ -48,6 +33,7 @@
         <file>diagrams/Hp9.png</file>
         <file>diagrams/Hp10.png</file>
         <file>diagrams/Hp11.png</file>
+        <file>diagrams/Hp12.png</file>
         <file>diagrams/Ip1.png</file>
         <file>diagrams/Ip2.png</file>
         <file>diagrams/Ip3.png</file>
@@ -55,23 +41,38 @@
         <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/Jp4.png</file>
+        <file>diagrams/Jp5.png</file>
         <file>diagrams/Kp1.png</file>
         <file>diagrams/Kp2.png</file>
         <file>diagrams/Kp3.png</file>
         <file>diagrams/Kp4.png</file>
+        <file>diagrams/Kp5.png</file>
+        <file>diagrams/Kp6.png</file>
+        <file>diagrams/Kp7.png</file>
+        <file>diagrams/Kp8.png</file>
+        <file>diagrams/Kp9.png</file>
+        <file>diagrams/Kp10.png</file>
+        <file>diagrams/Kp11.png</file>
         <file>diagrams/Lp1.png</file>
         <file>diagrams/Lp2.png</file>
         <file>diagrams/Lp3.png</file>
+        <file>diagrams/Lp4.png</file>
+        <file>diagrams/Lp5.png</file>
+        <file>diagrams/Lp6.png</file>
+        <file>diagrams/Lp7.png</file>
+        <file>diagrams/Lp8.png</file>
+        <file>diagrams/Lp9.png</file>
         <file>diagrams/Mp1.png</file>
         <file>diagrams/Mp2.png</file>
+        <file>diagrams/Mp3.png</file>
         <file>diagrams/Np1.png</file>
         <file>diagrams/Np2.png</file>
         <file>diagrams/Np3.png</file>
+        <file>diagrams/Np4.png</file>
         <file>diagrams/Op1.png</file>
         <file>diagrams/Op2.png</file>
         <file>diagrams/Op3.png</file>
diff --git a/src/app/tape/share/resources/diagrams/Ap2.png b/src/app/tape/share/resources/diagrams/Ap2.png
index f7d257d16..d39de94b0 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/Dp1.png b/src/app/tape/share/resources/diagrams/Dp1.png
index 33fb37ec5..926d6ec58 100644
Binary files a/src/app/tape/share/resources/diagrams/Dp1.png and b/src/app/tape/share/resources/diagrams/Dp1.png differ
diff --git a/src/app/tape/share/resources/diagrams/Dp2.png b/src/app/tape/share/resources/diagrams/Dp2.png
index a5ecb640d..f29bd09b9 100644
Binary files a/src/app/tape/share/resources/diagrams/Dp2.png and b/src/app/tape/share/resources/diagrams/Dp2.png differ
diff --git a/src/app/tape/share/resources/diagrams/Dp3.png b/src/app/tape/share/resources/diagrams/Dp3.png
index cf7a5bf89..e91e280db 100644
Binary files a/src/app/tape/share/resources/diagrams/Dp3.png and b/src/app/tape/share/resources/diagrams/Dp3.png differ
diff --git a/src/app/tape/share/resources/diagrams/Dp4.png b/src/app/tape/share/resources/diagrams/Dp4.png
deleted file mode 100644
index 4df1dc80e..000000000
Binary files a/src/app/tape/share/resources/diagrams/Dp4.png and /dev/null differ
diff --git a/src/app/tape/share/resources/diagrams/Dp5.png b/src/app/tape/share/resources/diagrams/Dp5.png
deleted file mode 100644
index f81991ca5..000000000
Binary files a/src/app/tape/share/resources/diagrams/Dp5.png and /dev/null differ
diff --git a/src/app/tape/share/resources/diagrams/Dp6.png b/src/app/tape/share/resources/diagrams/Dp6.png
deleted file mode 100644
index 7ede2c479..000000000
Binary files a/src/app/tape/share/resources/diagrams/Dp6.png and /dev/null differ
diff --git a/src/app/tape/share/resources/diagrams/Dp7.png b/src/app/tape/share/resources/diagrams/Dp7.png
deleted file mode 100644
index b55d3b97c..000000000
Binary files a/src/app/tape/share/resources/diagrams/Dp7.png and /dev/null differ
diff --git a/src/app/tape/share/resources/diagrams/Dp8.png b/src/app/tape/share/resources/diagrams/Dp8.png
deleted file mode 100644
index b3765373f..000000000
Binary files a/src/app/tape/share/resources/diagrams/Dp8.png and /dev/null differ
diff --git a/src/app/tape/share/resources/diagrams/Ep1.png b/src/app/tape/share/resources/diagrams/Ep1.png
index 24fca0838..48ac977d8 100644
Binary files a/src/app/tape/share/resources/diagrams/Ep1.png and b/src/app/tape/share/resources/diagrams/Ep1.png differ
diff --git a/src/app/tape/share/resources/diagrams/Ep10.png b/src/app/tape/share/resources/diagrams/Ep10.png
deleted file mode 100644
index c37724950..000000000
Binary files a/src/app/tape/share/resources/diagrams/Ep10.png and /dev/null differ
diff --git a/src/app/tape/share/resources/diagrams/Ep11.png b/src/app/tape/share/resources/diagrams/Ep11.png
deleted file mode 100644
index d91669773..000000000
Binary files a/src/app/tape/share/resources/diagrams/Ep11.png and /dev/null differ
diff --git a/src/app/tape/share/resources/diagrams/Ep12.png b/src/app/tape/share/resources/diagrams/Ep12.png
deleted file mode 100644
index 050df75f1..000000000
Binary files a/src/app/tape/share/resources/diagrams/Ep12.png and /dev/null differ
diff --git a/src/app/tape/share/resources/diagrams/Ep2.png b/src/app/tape/share/resources/diagrams/Ep2.png
index d6a5b789e..b735e2e15 100644
Binary files a/src/app/tape/share/resources/diagrams/Ep2.png and b/src/app/tape/share/resources/diagrams/Ep2.png differ
diff --git a/src/app/tape/share/resources/diagrams/Ep3.png b/src/app/tape/share/resources/diagrams/Ep3.png
deleted file mode 100644
index 581add3b3..000000000
Binary files a/src/app/tape/share/resources/diagrams/Ep3.png and /dev/null differ
diff --git a/src/app/tape/share/resources/diagrams/Ep4.png b/src/app/tape/share/resources/diagrams/Ep4.png
deleted file mode 100644
index 21fbe44b6..000000000
Binary files a/src/app/tape/share/resources/diagrams/Ep4.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
deleted file mode 100644
index a95e780f2..000000000
Binary files a/src/app/tape/share/resources/diagrams/Ep5.png and /dev/null differ
diff --git a/src/app/tape/share/resources/diagrams/Ep6.png b/src/app/tape/share/resources/diagrams/Ep6.png
deleted file mode 100644
index 22651b917..000000000
Binary files a/src/app/tape/share/resources/diagrams/Ep6.png and /dev/null differ
diff --git a/src/app/tape/share/resources/diagrams/Ep7.png b/src/app/tape/share/resources/diagrams/Ep7.png
deleted file mode 100644
index 122eb31d9..000000000
Binary files a/src/app/tape/share/resources/diagrams/Ep7.png and /dev/null differ
diff --git a/src/app/tape/share/resources/diagrams/Ep8.png b/src/app/tape/share/resources/diagrams/Ep8.png
deleted file mode 100644
index fc738dd09..000000000
Binary files a/src/app/tape/share/resources/diagrams/Ep8.png and /dev/null differ
diff --git a/src/app/tape/share/resources/diagrams/Ep9.png b/src/app/tape/share/resources/diagrams/Ep9.png
deleted file mode 100644
index d8384507a..000000000
Binary files a/src/app/tape/share/resources/diagrams/Ep9.png and /dev/null differ
diff --git a/src/app/tape/share/resources/diagrams/Fp1.png b/src/app/tape/share/resources/diagrams/Fp1.png
index 4bac65efc..751ed0fb0 100644
Binary files a/src/app/tape/share/resources/diagrams/Fp1.png and b/src/app/tape/share/resources/diagrams/Fp1.png differ
diff --git a/src/app/tape/share/resources/diagrams/Fp2.png b/src/app/tape/share/resources/diagrams/Fp2.png
index 53f6702e0..60c5a496f 100644
Binary files a/src/app/tape/share/resources/diagrams/Fp2.png and b/src/app/tape/share/resources/diagrams/Fp2.png differ
diff --git a/src/app/tape/share/resources/diagrams/Fp3.png b/src/app/tape/share/resources/diagrams/Fp3.png
index 5e33fa8b3..b042e44b8 100644
Binary files a/src/app/tape/share/resources/diagrams/Fp3.png and b/src/app/tape/share/resources/diagrams/Fp3.png differ
diff --git a/src/app/tape/share/resources/diagrams/Fp4.png b/src/app/tape/share/resources/diagrams/Fp4.png
deleted file mode 100644
index 6e5322a80..000000000
Binary files a/src/app/tape/share/resources/diagrams/Fp4.png and /dev/null differ
diff --git a/src/app/tape/share/resources/diagrams/Fp5.png b/src/app/tape/share/resources/diagrams/Fp5.png
deleted file mode 100644
index 02774c18c..000000000
Binary files a/src/app/tape/share/resources/diagrams/Fp5.png and /dev/null differ
diff --git a/src/app/tape/share/resources/diagrams/Fp6.png b/src/app/tape/share/resources/diagrams/Fp6.png
deleted file mode 100644
index f96069cd5..000000000
Binary files a/src/app/tape/share/resources/diagrams/Fp6.png and /dev/null differ
diff --git a/src/app/tape/share/resources/diagrams/Fp7.png b/src/app/tape/share/resources/diagrams/Fp7.png
deleted file mode 100644
index f0ade4ac3..000000000
Binary files a/src/app/tape/share/resources/diagrams/Fp7.png and /dev/null differ
diff --git a/src/app/tape/share/resources/diagrams/Gp1.png b/src/app/tape/share/resources/diagrams/Gp1.png
index bcae915de..291cbe103 100644
Binary files a/src/app/tape/share/resources/diagrams/Gp1.png and b/src/app/tape/share/resources/diagrams/Gp1.png differ
diff --git a/src/app/tape/share/resources/diagrams/Gp2.png b/src/app/tape/share/resources/diagrams/Gp2.png
index e872ea3b2..319f04586 100644
Binary files a/src/app/tape/share/resources/diagrams/Gp2.png and b/src/app/tape/share/resources/diagrams/Gp2.png differ
diff --git a/src/app/tape/share/resources/diagrams/Gp3.png b/src/app/tape/share/resources/diagrams/Gp3.png
index 4af2dbdf9..703e83d1e 100644
Binary files a/src/app/tape/share/resources/diagrams/Gp3.png and b/src/app/tape/share/resources/diagrams/Gp3.png differ
diff --git a/src/app/tape/share/resources/diagrams/Gp4.png b/src/app/tape/share/resources/diagrams/Gp4.png
index 6611f4d17..b819421c5 100644
Binary files a/src/app/tape/share/resources/diagrams/Gp4.png and b/src/app/tape/share/resources/diagrams/Gp4.png differ
diff --git a/src/app/tape/share/resources/diagrams/Gp5.png b/src/app/tape/share/resources/diagrams/Gp5.png
new file mode 100644
index 000000000..8bef89c93
Binary files /dev/null and b/src/app/tape/share/resources/diagrams/Gp5.png differ
diff --git a/src/app/tape/share/resources/diagrams/Gp6.png b/src/app/tape/share/resources/diagrams/Gp6.png
new file mode 100644
index 000000000..99d34612f
Binary files /dev/null and b/src/app/tape/share/resources/diagrams/Gp6.png differ
diff --git a/src/app/tape/share/resources/diagrams/Gp7.png b/src/app/tape/share/resources/diagrams/Gp7.png
new file mode 100644
index 000000000..3e7c7a4de
Binary files /dev/null and b/src/app/tape/share/resources/diagrams/Gp7.png differ
diff --git a/src/app/tape/share/resources/diagrams/Gp8.png b/src/app/tape/share/resources/diagrams/Gp8.png
new file mode 100644
index 000000000..90b43fe5f
Binary files /dev/null and b/src/app/tape/share/resources/diagrams/Gp8.png differ
diff --git a/src/app/tape/share/resources/diagrams/Hp1.png b/src/app/tape/share/resources/diagrams/Hp1.png
index aaca513ee..2a43a83c4 100644
Binary files a/src/app/tape/share/resources/diagrams/Hp1.png and b/src/app/tape/share/resources/diagrams/Hp1.png differ
diff --git a/src/app/tape/share/resources/diagrams/Hp10.png b/src/app/tape/share/resources/diagrams/Hp10.png
index 439573be4..9f746f4dc 100644
Binary files a/src/app/tape/share/resources/diagrams/Hp10.png and b/src/app/tape/share/resources/diagrams/Hp10.png differ
diff --git a/src/app/tape/share/resources/diagrams/Hp11.png b/src/app/tape/share/resources/diagrams/Hp11.png
index 96cf33850..14fb4e8b8 100644
Binary files a/src/app/tape/share/resources/diagrams/Hp11.png and b/src/app/tape/share/resources/diagrams/Hp11.png differ
diff --git a/src/app/tape/share/resources/diagrams/Hp12.png b/src/app/tape/share/resources/diagrams/Hp12.png
new file mode 100644
index 000000000..179726de5
Binary files /dev/null and b/src/app/tape/share/resources/diagrams/Hp12.png differ
diff --git a/src/app/tape/share/resources/diagrams/Hp2.png b/src/app/tape/share/resources/diagrams/Hp2.png
index 3286b211e..b8e4c05f3 100644
Binary files a/src/app/tape/share/resources/diagrams/Hp2.png and b/src/app/tape/share/resources/diagrams/Hp2.png differ
diff --git a/src/app/tape/share/resources/diagrams/Hp3.png b/src/app/tape/share/resources/diagrams/Hp3.png
index ad9fac0b4..c7c968d21 100644
Binary files a/src/app/tape/share/resources/diagrams/Hp3.png and b/src/app/tape/share/resources/diagrams/Hp3.png differ
diff --git a/src/app/tape/share/resources/diagrams/Hp4.png b/src/app/tape/share/resources/diagrams/Hp4.png
index 345bd4a77..99ed973a7 100644
Binary files a/src/app/tape/share/resources/diagrams/Hp4.png and b/src/app/tape/share/resources/diagrams/Hp4.png differ
diff --git a/src/app/tape/share/resources/diagrams/Hp5.png b/src/app/tape/share/resources/diagrams/Hp5.png
index 7108c54b4..96f1b1410 100644
Binary files a/src/app/tape/share/resources/diagrams/Hp5.png and b/src/app/tape/share/resources/diagrams/Hp5.png differ
diff --git a/src/app/tape/share/resources/diagrams/Hp6.png b/src/app/tape/share/resources/diagrams/Hp6.png
index 8af72ea89..1c7729a0f 100644
Binary files a/src/app/tape/share/resources/diagrams/Hp6.png and b/src/app/tape/share/resources/diagrams/Hp6.png differ
diff --git a/src/app/tape/share/resources/diagrams/Hp7.png b/src/app/tape/share/resources/diagrams/Hp7.png
index 47c5b23a7..87a957303 100644
Binary files a/src/app/tape/share/resources/diagrams/Hp7.png and b/src/app/tape/share/resources/diagrams/Hp7.png differ
diff --git a/src/app/tape/share/resources/diagrams/Hp8.png b/src/app/tape/share/resources/diagrams/Hp8.png
index 7499c6070..170c38c1b 100644
Binary files a/src/app/tape/share/resources/diagrams/Hp8.png and b/src/app/tape/share/resources/diagrams/Hp8.png differ
diff --git a/src/app/tape/share/resources/diagrams/Hp9.png b/src/app/tape/share/resources/diagrams/Hp9.png
index b6b3632de..0b3ed8911 100644
Binary files a/src/app/tape/share/resources/diagrams/Hp9.png and b/src/app/tape/share/resources/diagrams/Hp9.png differ
diff --git a/src/app/tape/share/resources/diagrams/Ip1.png b/src/app/tape/share/resources/diagrams/Ip1.png
index a85831924..d6594e1fa 100644
Binary files a/src/app/tape/share/resources/diagrams/Ip1.png and b/src/app/tape/share/resources/diagrams/Ip1.png differ
diff --git a/src/app/tape/share/resources/diagrams/Ip2.png b/src/app/tape/share/resources/diagrams/Ip2.png
index 98ad894d2..19bb07b38 100644
Binary files a/src/app/tape/share/resources/diagrams/Ip2.png and b/src/app/tape/share/resources/diagrams/Ip2.png differ
diff --git a/src/app/tape/share/resources/diagrams/Ip3.png b/src/app/tape/share/resources/diagrams/Ip3.png
index 2fa35f4db..45fc1d721 100644
Binary files a/src/app/tape/share/resources/diagrams/Ip3.png and b/src/app/tape/share/resources/diagrams/Ip3.png differ
diff --git a/src/app/tape/share/resources/diagrams/Ip4.png b/src/app/tape/share/resources/diagrams/Ip4.png
index 433c88b2d..583a87f1d 100644
Binary files a/src/app/tape/share/resources/diagrams/Ip4.png and b/src/app/tape/share/resources/diagrams/Ip4.png differ
diff --git a/src/app/tape/share/resources/diagrams/Ip5.png b/src/app/tape/share/resources/diagrams/Ip5.png
index caf8028db..8cbdb6537 100644
Binary files a/src/app/tape/share/resources/diagrams/Ip5.png and b/src/app/tape/share/resources/diagrams/Ip5.png differ
diff --git a/src/app/tape/share/resources/diagrams/Ip6.png b/src/app/tape/share/resources/diagrams/Ip6.png
index aac915654..b1c9af433 100644
Binary files a/src/app/tape/share/resources/diagrams/Ip6.png and b/src/app/tape/share/resources/diagrams/Ip6.png differ
diff --git a/src/app/tape/share/resources/diagrams/Ip7.png b/src/app/tape/share/resources/diagrams/Ip7.png
index 0fc8be28f..337926db0 100644
Binary files a/src/app/tape/share/resources/diagrams/Ip7.png and b/src/app/tape/share/resources/diagrams/Ip7.png differ
diff --git a/src/app/tape/share/resources/diagrams/Ip8.png b/src/app/tape/share/resources/diagrams/Ip8.png
deleted file mode 100644
index d1bf8187f..000000000
Binary files a/src/app/tape/share/resources/diagrams/Ip8.png and /dev/null differ
diff --git a/src/app/tape/share/resources/diagrams/Ip9.png b/src/app/tape/share/resources/diagrams/Ip9.png
deleted file mode 100644
index b98e11158..000000000
Binary files a/src/app/tape/share/resources/diagrams/Ip9.png and /dev/null differ
diff --git a/src/app/tape/share/resources/diagrams/Jp1.png b/src/app/tape/share/resources/diagrams/Jp1.png
index 54dd65a6b..801f0c88e 100644
Binary files a/src/app/tape/share/resources/diagrams/Jp1.png and b/src/app/tape/share/resources/diagrams/Jp1.png differ
diff --git a/src/app/tape/share/resources/diagrams/Jp2.png b/src/app/tape/share/resources/diagrams/Jp2.png
index 11c8da863..8a9a3d189 100644
Binary files a/src/app/tape/share/resources/diagrams/Jp2.png and b/src/app/tape/share/resources/diagrams/Jp2.png differ
diff --git a/src/app/tape/share/resources/diagrams/Jp3.png b/src/app/tape/share/resources/diagrams/Jp3.png
index de5ca0fba..e206cd8d2 100644
Binary files a/src/app/tape/share/resources/diagrams/Jp3.png and b/src/app/tape/share/resources/diagrams/Jp3.png differ
diff --git a/src/app/tape/share/resources/diagrams/Jp4.png b/src/app/tape/share/resources/diagrams/Jp4.png
new file mode 100644
index 000000000..e42811630
Binary files /dev/null and b/src/app/tape/share/resources/diagrams/Jp4.png differ
diff --git a/src/app/tape/share/resources/diagrams/Jp5.png b/src/app/tape/share/resources/diagrams/Jp5.png
new file mode 100644
index 000000000..9e67c7f0c
Binary files /dev/null and b/src/app/tape/share/resources/diagrams/Jp5.png differ
diff --git a/src/app/tape/share/resources/diagrams/Kp1.png b/src/app/tape/share/resources/diagrams/Kp1.png
index 20aff29b4..ddf3da739 100644
Binary files a/src/app/tape/share/resources/diagrams/Kp1.png and b/src/app/tape/share/resources/diagrams/Kp1.png differ
diff --git a/src/app/tape/share/resources/diagrams/Kp10.png b/src/app/tape/share/resources/diagrams/Kp10.png
new file mode 100644
index 000000000..7786827ad
Binary files /dev/null and b/src/app/tape/share/resources/diagrams/Kp10.png differ
diff --git a/src/app/tape/share/resources/diagrams/Kp11.png b/src/app/tape/share/resources/diagrams/Kp11.png
new file mode 100644
index 000000000..ea7387b8c
Binary files /dev/null and b/src/app/tape/share/resources/diagrams/Kp11.png differ
diff --git a/src/app/tape/share/resources/diagrams/Kp2.png b/src/app/tape/share/resources/diagrams/Kp2.png
index 50d096088..e22e26b75 100644
Binary files a/src/app/tape/share/resources/diagrams/Kp2.png and b/src/app/tape/share/resources/diagrams/Kp2.png differ
diff --git a/src/app/tape/share/resources/diagrams/Kp3.png b/src/app/tape/share/resources/diagrams/Kp3.png
index fa7199ddb..f3ee408c7 100644
Binary files a/src/app/tape/share/resources/diagrams/Kp3.png and b/src/app/tape/share/resources/diagrams/Kp3.png differ
diff --git a/src/app/tape/share/resources/diagrams/Kp4.png b/src/app/tape/share/resources/diagrams/Kp4.png
index bd1b9eb55..94c82b0a6 100644
Binary files a/src/app/tape/share/resources/diagrams/Kp4.png and b/src/app/tape/share/resources/diagrams/Kp4.png differ
diff --git a/src/app/tape/share/resources/diagrams/Kp5.png b/src/app/tape/share/resources/diagrams/Kp5.png
new file mode 100644
index 000000000..4e6a84084
Binary files /dev/null and b/src/app/tape/share/resources/diagrams/Kp5.png differ
diff --git a/src/app/tape/share/resources/diagrams/Kp6.png b/src/app/tape/share/resources/diagrams/Kp6.png
new file mode 100644
index 000000000..737516f7f
Binary files /dev/null and b/src/app/tape/share/resources/diagrams/Kp6.png differ
diff --git a/src/app/tape/share/resources/diagrams/Kp7.png b/src/app/tape/share/resources/diagrams/Kp7.png
new file mode 100644
index 000000000..fa81e06dd
Binary files /dev/null and b/src/app/tape/share/resources/diagrams/Kp7.png differ
diff --git a/src/app/tape/share/resources/diagrams/Kp8.png b/src/app/tape/share/resources/diagrams/Kp8.png
new file mode 100644
index 000000000..50ce6aa2a
Binary files /dev/null and b/src/app/tape/share/resources/diagrams/Kp8.png differ
diff --git a/src/app/tape/share/resources/diagrams/Kp9.png b/src/app/tape/share/resources/diagrams/Kp9.png
new file mode 100644
index 000000000..1fd8ca8e2
Binary files /dev/null and b/src/app/tape/share/resources/diagrams/Kp9.png differ
diff --git a/src/app/tape/share/resources/diagrams/Lp1.png b/src/app/tape/share/resources/diagrams/Lp1.png
index 1a13f16b6..0f0338a32 100644
Binary files a/src/app/tape/share/resources/diagrams/Lp1.png and b/src/app/tape/share/resources/diagrams/Lp1.png differ
diff --git a/src/app/tape/share/resources/diagrams/Lp2.png b/src/app/tape/share/resources/diagrams/Lp2.png
index fc9ab19ab..f00aed2be 100644
Binary files a/src/app/tape/share/resources/diagrams/Lp2.png and b/src/app/tape/share/resources/diagrams/Lp2.png differ
diff --git a/src/app/tape/share/resources/diagrams/Lp3.png b/src/app/tape/share/resources/diagrams/Lp3.png
index 51a43850c..20cf24942 100644
Binary files a/src/app/tape/share/resources/diagrams/Lp3.png and b/src/app/tape/share/resources/diagrams/Lp3.png differ
diff --git a/src/app/tape/share/resources/diagrams/Lp4.png b/src/app/tape/share/resources/diagrams/Lp4.png
new file mode 100644
index 000000000..76ead7862
Binary files /dev/null and b/src/app/tape/share/resources/diagrams/Lp4.png differ
diff --git a/src/app/tape/share/resources/diagrams/Lp5.png b/src/app/tape/share/resources/diagrams/Lp5.png
new file mode 100644
index 000000000..4425b2cf0
Binary files /dev/null and b/src/app/tape/share/resources/diagrams/Lp5.png differ
diff --git a/src/app/tape/share/resources/diagrams/Lp6.png b/src/app/tape/share/resources/diagrams/Lp6.png
new file mode 100644
index 000000000..6f7c70e64
Binary files /dev/null and b/src/app/tape/share/resources/diagrams/Lp6.png differ
diff --git a/src/app/tape/share/resources/diagrams/Lp7.png b/src/app/tape/share/resources/diagrams/Lp7.png
new file mode 100644
index 000000000..3e5d1f6ba
Binary files /dev/null and b/src/app/tape/share/resources/diagrams/Lp7.png differ
diff --git a/src/app/tape/share/resources/diagrams/Lp8.png b/src/app/tape/share/resources/diagrams/Lp8.png
new file mode 100644
index 000000000..a1d8f115f
Binary files /dev/null and b/src/app/tape/share/resources/diagrams/Lp8.png differ
diff --git a/src/app/tape/share/resources/diagrams/Lp9.png b/src/app/tape/share/resources/diagrams/Lp9.png
new file mode 100644
index 000000000..8be5a6b7a
Binary files /dev/null and b/src/app/tape/share/resources/diagrams/Lp9.png differ
diff --git a/src/app/tape/share/resources/diagrams/Mp1.png b/src/app/tape/share/resources/diagrams/Mp1.png
index e905ba41d..0dbe0d86e 100644
Binary files a/src/app/tape/share/resources/diagrams/Mp1.png and b/src/app/tape/share/resources/diagrams/Mp1.png differ
diff --git a/src/app/tape/share/resources/diagrams/Mp2.png b/src/app/tape/share/resources/diagrams/Mp2.png
index 3c75f1d2c..60979140f 100644
Binary files a/src/app/tape/share/resources/diagrams/Mp2.png and b/src/app/tape/share/resources/diagrams/Mp2.png differ
diff --git a/src/app/tape/share/resources/diagrams/Mp3.png b/src/app/tape/share/resources/diagrams/Mp3.png
new file mode 100644
index 000000000..1e09e24e7
Binary files /dev/null and b/src/app/tape/share/resources/diagrams/Mp3.png differ
diff --git a/src/app/tape/share/resources/diagrams/Np1.png b/src/app/tape/share/resources/diagrams/Np1.png
index a32b7a3e3..3796377ae 100644
Binary files a/src/app/tape/share/resources/diagrams/Np1.png and b/src/app/tape/share/resources/diagrams/Np1.png differ
diff --git a/src/app/tape/share/resources/diagrams/Np2.png b/src/app/tape/share/resources/diagrams/Np2.png
index 15c2873c3..ee0a912fd 100644
Binary files a/src/app/tape/share/resources/diagrams/Np2.png and b/src/app/tape/share/resources/diagrams/Np2.png differ
diff --git a/src/app/tape/share/resources/diagrams/Np3.png b/src/app/tape/share/resources/diagrams/Np3.png
index 02af3d91f..12090f265 100644
Binary files a/src/app/tape/share/resources/diagrams/Np3.png and b/src/app/tape/share/resources/diagrams/Np3.png differ
diff --git a/src/app/tape/share/resources/diagrams/Np4.png b/src/app/tape/share/resources/diagrams/Np4.png
new file mode 100644
index 000000000..8fb552089
Binary files /dev/null and b/src/app/tape/share/resources/diagrams/Np4.png differ
diff --git a/src/app/tape/share/resources/diagrams/Pp1.png b/src/app/tape/share/resources/diagrams/Pp1.png
index 5c2c11989..764dce5ee 100644
Binary files a/src/app/tape/share/resources/diagrams/Pp1.png and b/src/app/tape/share/resources/diagrams/Pp1.png differ
diff --git a/src/app/tape/share/resources/diagrams/Pp10.png b/src/app/tape/share/resources/diagrams/Pp10.png
index b3b0d6e4b..f88041040 100644
Binary files a/src/app/tape/share/resources/diagrams/Pp10.png and b/src/app/tape/share/resources/diagrams/Pp10.png differ
diff --git a/src/app/tape/share/resources/diagrams/Pp11.png b/src/app/tape/share/resources/diagrams/Pp11.png
index a1660604e..e8d0afd31 100644
Binary files a/src/app/tape/share/resources/diagrams/Pp11.png and b/src/app/tape/share/resources/diagrams/Pp11.png differ
diff --git a/src/app/tape/share/resources/diagrams/Pp12.png b/src/app/tape/share/resources/diagrams/Pp12.png
index 520564a62..2f9c01cd9 100644
Binary files a/src/app/tape/share/resources/diagrams/Pp12.png and b/src/app/tape/share/resources/diagrams/Pp12.png differ
diff --git a/src/app/tape/share/resources/diagrams/Pp2.png b/src/app/tape/share/resources/diagrams/Pp2.png
index 433cdb8c9..b0ecb7a5f 100644
Binary files a/src/app/tape/share/resources/diagrams/Pp2.png and b/src/app/tape/share/resources/diagrams/Pp2.png differ
diff --git a/src/app/tape/share/resources/diagrams/Pp3.png b/src/app/tape/share/resources/diagrams/Pp3.png
index 6ac0f9e3e..95a51fa7b 100644
Binary files a/src/app/tape/share/resources/diagrams/Pp3.png and b/src/app/tape/share/resources/diagrams/Pp3.png differ
diff --git a/src/app/tape/share/resources/diagrams/Pp4.png b/src/app/tape/share/resources/diagrams/Pp4.png
index 9448df17e..686754cca 100644
Binary files a/src/app/tape/share/resources/diagrams/Pp4.png and b/src/app/tape/share/resources/diagrams/Pp4.png differ
diff --git a/src/app/tape/share/resources/diagrams/Pp5.png b/src/app/tape/share/resources/diagrams/Pp5.png
index e9dcc307d..31a9e22fa 100644
Binary files a/src/app/tape/share/resources/diagrams/Pp5.png and b/src/app/tape/share/resources/diagrams/Pp5.png differ
diff --git a/src/app/tape/share/resources/diagrams/Pp6.png b/src/app/tape/share/resources/diagrams/Pp6.png
index 2d8f12d55..96f720662 100644
Binary files a/src/app/tape/share/resources/diagrams/Pp6.png and b/src/app/tape/share/resources/diagrams/Pp6.png differ
diff --git a/src/app/tape/share/resources/diagrams/Pp7.png b/src/app/tape/share/resources/diagrams/Pp7.png
index 355455447..649da4342 100644
Binary files a/src/app/tape/share/resources/diagrams/Pp7.png and b/src/app/tape/share/resources/diagrams/Pp7.png differ
diff --git a/src/app/tape/share/resources/diagrams/Pp8.png b/src/app/tape/share/resources/diagrams/Pp8.png
index 8dc10a58d..729ff70d6 100644
Binary files a/src/app/tape/share/resources/diagrams/Pp8.png and b/src/app/tape/share/resources/diagrams/Pp8.png differ
diff --git a/src/app/tape/share/resources/diagrams/Pp9.png b/src/app/tape/share/resources/diagrams/Pp9.png
index b56b06121..7d1d15de6 100644
Binary files a/src/app/tape/share/resources/diagrams/Pp9.png and b/src/app/tape/share/resources/diagrams/Pp9.png differ
diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro
index add8c4fdc..7c6c44553 100644
--- a/src/app/tape/tape.pro
+++ b/src/app/tape/tape.pro
@@ -246,34 +246,19 @@ DIAGRAMS += \
         $${PWD}/share/resources/diagrams/Dp1.png \
         $${PWD}/share/resources/diagrams/Dp2.png \
         $${PWD}/share/resources/diagrams/Dp3.png \
-        $${PWD}/share/resources/diagrams/Dp4.png \
-        $${PWD}/share/resources/diagrams/Dp5.png \
-        $${PWD}/share/resources/diagrams/Dp6.png \
-        $${PWD}/share/resources/diagrams/Dp7.png \
-        $${PWD}/share/resources/diagrams/Dp8.png \
         $${PWD}/share/resources/diagrams/Ep1.png \
         $${PWD}/share/resources/diagrams/Ep2.png \
-        $${PWD}/share/resources/diagrams/Ep3.png \
-        $${PWD}/share/resources/diagrams/Ep4.png \
-        $${PWD}/share/resources/diagrams/Ep5.png \
-        $${PWD}/share/resources/diagrams/Ep6.png \
-        $${PWD}/share/resources/diagrams/Ep7.png \
-        $${PWD}/share/resources/diagrams/Ep8.png \
-        $${PWD}/share/resources/diagrams/Ep9.png \
-        $${PWD}/share/resources/diagrams/Ep10.png \
-        $${PWD}/share/resources/diagrams/Ep11.png \
-        $${PWD}/share/resources/diagrams/Ep12.png \
         $${PWD}/share/resources/diagrams/Fp1.png \
         $${PWD}/share/resources/diagrams/Fp2.png \
         $${PWD}/share/resources/diagrams/Fp3.png \
-        $${PWD}/share/resources/diagrams/Fp4.png \
-        $${PWD}/share/resources/diagrams/Fp5.png \
-        $${PWD}/share/resources/diagrams/Fp6.png \
-        $${PWD}/share/resources/diagrams/Fp7.png \
         $${PWD}/share/resources/diagrams/Gp1.png \
         $${PWD}/share/resources/diagrams/Gp2.png \
         $${PWD}/share/resources/diagrams/Gp3.png \
         $${PWD}/share/resources/diagrams/Gp4.png \
+        $${PWD}/share/resources/diagrams/Gp5.png \
+        $${PWD}/share/resources/diagrams/Gp6.png \
+        $${PWD}/share/resources/diagrams/Gp7.png \
+        $${PWD}/share/resources/diagrams/Gp8.png \
         $${PWD}/share/resources/diagrams/Hp1.png \
         $${PWD}/share/resources/diagrams/Hp2.png \
         $${PWD}/share/resources/diagrams/Hp3.png \
@@ -285,6 +270,7 @@ DIAGRAMS += \
         $${PWD}/share/resources/diagrams/Hp9.png \
         $${PWD}/share/resources/diagrams/Hp10.png \
         $${PWD}/share/resources/diagrams/Hp11.png \
+        $${PWD}/share/resources/diagrams/Hp12.png \
         $${PWD}/share/resources/diagrams/Ip1.png \
         $${PWD}/share/resources/diagrams/Ip2.png \
         $${PWD}/share/resources/diagrams/Ip3.png \
@@ -292,22 +278,38 @@ DIAGRAMS += \
         $${PWD}/share/resources/diagrams/Ip5.png \
         $${PWD}/share/resources/diagrams/Ip6.png \
         $${PWD}/share/resources/diagrams/Ip7.png \
-        $${PWD}/share/resources/diagrams/Ip8.png \
-        $${PWD}/share/resources/diagrams/Ip9.png \
         $${PWD}/share/resources/diagrams/Jp1.png \
         $${PWD}/share/resources/diagrams/Jp2.png \
+        $${PWD}/share/resources/diagrams/Jp3.png \
+        $${PWD}/share/resources/diagrams/Jp4.png \
+        $${PWD}/share/resources/diagrams/Jp5.png \
         $${PWD}/share/resources/diagrams/Kp1.png \
         $${PWD}/share/resources/diagrams/Kp2.png \
         $${PWD}/share/resources/diagrams/Kp3.png \
         $${PWD}/share/resources/diagrams/Kp4.png \
+        $${PWD}/share/resources/diagrams/Kp5.png \
+        $${PWD}/share/resources/diagrams/Kp6.png \
+        $${PWD}/share/resources/diagrams/Kp7.png \
+        $${PWD}/share/resources/diagrams/Kp8.png \
+        $${PWD}/share/resources/diagrams/Kp9.png \
+        $${PWD}/share/resources/diagrams/Kp10.png \
+        $${PWD}/share/resources/diagrams/Kp11.png \
         $${PWD}/share/resources/diagrams/Lp1.png \
         $${PWD}/share/resources/diagrams/Lp2.png \
         $${PWD}/share/resources/diagrams/Lp3.png \
+        $${PWD}/share/resources/diagrams/Lp4.png \
+        $${PWD}/share/resources/diagrams/Lp5.png \
+        $${PWD}/share/resources/diagrams/Lp6.png \
+        $${PWD}/share/resources/diagrams/Lp7.png \
+        $${PWD}/share/resources/diagrams/Lp8.png \
+        $${PWD}/share/resources/diagrams/Lp9.png \
         $${PWD}/share/resources/diagrams/Mp1.png \
         $${PWD}/share/resources/diagrams/Mp2.png \
+        $${PWD}/share/resources/diagrams/Mp3.png \
         $${PWD}/share/resources/diagrams/Np1.png \
         $${PWD}/share/resources/diagrams/Np2.png \
         $${PWD}/share/resources/diagrams/Np3.png \
+        $${PWD}/share/resources/diagrams/Np4.png \
         $${PWD}/share/resources/diagrams/Op1.png \
         $${PWD}/share/resources/diagrams/Op2.png \
         $${PWD}/share/resources/diagrams/Op3.png \
diff --git a/src/libs/vmisc/def.cpp b/src/libs/vmisc/def.cpp
index 04fd2eb0f..65f3c7ac9 100644
--- a/src/libs/vmisc/def.cpp
+++ b/src/libs/vmisc/def.cpp
@@ -148,8 +148,8 @@ const QString shoulderTipToArmfoldF_M         = QStringLiteral("shoulder_tip_to_
 const QString neckSideToBustF_M               = QStringLiteral("neck_side_to_bust_f");               // H14
 const QString neckSideToHighbustF_M           = QStringLiteral("neck_side_to_highbust_f");           // H15
 const QString shoulderCenterToHighbustF_M     = QStringLiteral("shoulder_center_to_highbust_f");     // H16
-const QString neckSideToWaistB_M              = QStringLiteral("neck_side_to_waist_b");              // H17
-const QString shoulderTipToWaistSideB_M       = QStringLiteral("shoulder_tip_to_waist_side_b");      // H18
+const QString shoulderTipToWaistSideB_M       = QStringLiteral("shoulder_tip_to_waist_side_b");      // H17
+const QString neckSideToWaistB_M              = QStringLiteral("neck_side_to_waist_b");              // H18
 const QString neckBackToWaistB_M              = QStringLiteral("neck_back_to_waist_b");              // H19
 const QString neckSideToWaistScapulaB_M       = QStringLiteral("neck_side_to_waist_scapula_b");      // H20
 const QString neckBackToHighbustB_M           = QStringLiteral("neck_back_to_highbust_b");           // H21
@@ -719,8 +719,8 @@ QStringList ListGroupH()
                                            << neckSideToBustF_M                // H14
                                            << neckSideToHighbustF_M            // H15
                                            << shoulderCenterToHighbustF_M      // H16
-                                           << neckSideToWaistB_M               // H17
-                                           << shoulderTipToWaistSideB_M        // H18
+                                           << shoulderTipToWaistSideB_M        // H17
+                                           << neckSideToWaistB_M               // H18
                                            << neckBackToWaistB_M               // H19
                                            << neckSideToWaistScapulaB_M        // H20
                                            << neckBackToHighbustB_M            // H21
diff --git a/src/libs/vmisc/def.h b/src/libs/vmisc/def.h
index 329fd2785..2e92a8b6f 100644
--- a/src/libs/vmisc/def.h
+++ b/src/libs/vmisc/def.h
@@ -306,8 +306,8 @@ extern const QString shoulderTipToArmfoldF_M;         // H13
 extern const QString neckSideToBustF_M;               // H14
 extern const QString neckSideToHighbustF_M;           // H15
 extern const QString shoulderCenterToHighbustF_M;     // H16
-extern const QString neckSideToWaistB_M;              // H17
-extern const QString shoulderTipToWaistSideB_M;       // H18
+extern const QString shoulderTipToWaistSideB_M;       // H17
+extern const QString neckSideToWaistB_M;              // H18
 extern const QString neckBackToWaistB_M;              // H19
 extern const QString neckSideToWaistScapulaB_M;       // H20
 extern const QString neckBackToHighbustB_M;           // H21