diff --git a/components/lazbarcodes/images/tbarcodemedical.png b/components/lazbarcodes/images/tbarcodemedical.png
index e7ce2a730..ce9169837 100644
Binary files a/components/lazbarcodes/images/tbarcodemedical.png and b/components/lazbarcodes/images/tbarcodemedical.png differ
diff --git a/components/lazbarcodes/images/tbarcodemedical_150.png b/components/lazbarcodes/images/tbarcodemedical_150.png
index 300eafbbc..4ae9bc286 100644
Binary files a/components/lazbarcodes/images/tbarcodemedical_150.png and b/components/lazbarcodes/images/tbarcodemedical_150.png differ
diff --git a/components/lazbarcodes/images/tbarcodemedical_200.png b/components/lazbarcodes/images/tbarcodemedical_200.png
index 60d09f1d6..10eee0ae1 100644
Binary files a/components/lazbarcodes/images/tbarcodemedical_200.png and b/components/lazbarcodes/images/tbarcodemedical_200.png differ
diff --git a/components/lazbarcodes/src/lazbarcodes_icons.res b/components/lazbarcodes/src/lazbarcodes_icons.res
index 45c3b6a04..a38adebe3 100644
Binary files a/components/lazbarcodes/src/lazbarcodes_icons.res and b/components/lazbarcodes/src/lazbarcodes_icons.res differ
diff --git a/image_sources/ccr/components/lazbarcodes/svg (Roland Hahn)/tbarcodemedical 2.svg b/image_sources/ccr/components/lazbarcodes/svg (Roland Hahn)/tbarcodemedical 2.svg
index eebb21a34..2ab3552b1 100644
--- a/image_sources/ccr/components/lazbarcodes/svg (Roland Hahn)/tbarcodemedical 2.svg	
+++ b/image_sources/ccr/components/lazbarcodes/svg (Roland Hahn)/tbarcodemedical 2.svg	
@@ -9,7 +9,7 @@
    inkscape:export-filename="tbarcodemedical 2.png"
    inkscape:export-xdpi="96"
    inkscape:export-ydpi="96"
-   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04, custom)"
+   inkscape:version="1.2-beta (1b65182ce9, 2022-04-05)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
@@ -25,17 +25,19 @@
      inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
      showgrid="true"
-     inkscape:zoom="31.041667"
-     inkscape:cx="11.983893"
-     inkscape:cy="11.983893"
-     inkscape:current-layer="svg37">
+     inkscape:zoom="38.25"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:current-layer="svg37"
+     inkscape:deskcolor="#d1d1d1"
+     showguides="true">
     <inkscape:grid
        type="xygrid"
        id="grid858" />
   </sodipodi:namedview>
   <linearGradient
      id="a"
-     gradientTransform="matrix(.15636305 0 0 .15646199 -23.005606 27.133724)"
+     gradientTransform="matrix(0.15636305,0,0,0.15646199,-23.005606,27.133724)"
      gradientUnits="userSpaceOnUse"
      x1="230.26965"
      x2="271.83875"
@@ -51,76 +53,79 @@
        id="stop4" />
   </linearGradient>
   <g
-     id="g35">
+     id="g330">
     <path
-       d="m0 2h23v16h-23z"
-       fill="#fff"
+       d="M 0,2 H 23 V 18 H 0 Z"
+       fill="#ffffff"
        id="path7" />
     <g
        fill="none"
        id="g27">
       <path
-         d="m1.5 3v14"
-         stroke="#000"
+         d="M 1.5,3 V 17"
+         stroke="#000000"
          id="path9" />
       <path
-         d="m3.5 3v14"
-         stroke="#000"
+         d="M 3.5,3 V 17"
+         stroke="#000000"
          id="path11" />
       <path
-         d="m5.5 3v14"
-         stroke="#000"
+         d="M 5.5,3 V 17"
+         stroke="#000000"
          id="path13" />
       <path
-         d="m13.5 3v14"
-         stroke="#000"
+         d="M 13.5,3 V 17"
+         stroke="#000000"
          id="path15" />
       <path
-         d="m21.5 3v14"
-         stroke="#000"
+         d="M 21.5,3 V 17"
+         stroke="#000000"
          id="path17" />
       <path
-         d="m10.5 3v14"
-         stroke="#000"
+         d="M 10.5,3 V 17"
+         stroke="#000000"
          stroke-width="3"
          id="path19" />
       <path
-         d="m15.5 3v14"
-         stroke="#000"
+         d="M 15.5,3 V 17"
+         stroke="#000000"
          id="path21" />
       <path
-         d="m18.5 3v14"
-         stroke="#000"
+         d="M 18.5,3 V 17"
+         stroke="#000000"
          stroke-width="3"
          id="path23" />
       <path
-         d="m7.5 3v14"
-         stroke="#000"
+         d="M 7.5,3 V 17"
+         stroke="#000000"
          id="path25" />
     </g>
-    <path
-       d="m12.344755 8.5022106c-4.7724027-.1362496-6.6448889 7.2345394 3.653264 14.8751534 12.674649-9.403817 6.913443-18.3987817 0-13.4924356-1.296271-.9199412-2.551938-1.3512631-3.653264-1.3827178z"
-       fill="url(#a)"
-       stroke="#fff"
-       stroke-width="1.0003"
-       id="path29" />
-    <path
-       d="m211.47343-53.5263h3.16182l6.32364-7.773771 6.32364 7.773771 12.64728-38.868856 18.97091 54.416399 12.64728-27.2082 6.32364 11.660657h6.32364"
-       fill="none"
-       stroke="#fff"
-       stroke-linecap="round"
-       stroke-linejoin="round"
-       stroke-width="17.5283"
-       transform="matrix(.15813678 0 0 .12863769 -23.441726 24.3855)"
-       id="path31" />
-    <path
-       d="m211.47343-53.5263h3.16182l6.32364-7.773771 6.32364 7.773771 12.64728-38.868856 18.97091 54.416399 12.64728-27.2082 6.32364 11.660657h6.32364"
-       fill="none"
-       stroke="#000080"
-       stroke-linecap="round"
-       stroke-linejoin="round"
-       stroke-width="3.50566"
-       transform="matrix(.15813678 0 0 .12863769 -23.441726 24.3855)"
-       id="path33" />
   </g>
+  <path
+     d="M 12.344755,8.5022106 C 7.5723523,8.365961 5.6998661,15.73675 15.998019,23.377364 c 12.674649,-9.403817 6.913443,-18.3987817 0,-13.4924356 C 14.701748,8.9649872 13.446081,8.5336653 12.344755,8.5022106 Z"
+     fill="url(#a)"
+     stroke="#ffffff"
+     stroke-width="1.0003"
+     id="path29"
+     style="fill:url(#a)" />
+  <path
+     d="m 9.5,16.5 h 1.020564 L 12,15 13,16 15,12.021635 18,17 l 2,-2.5 1.5,2 h 1"
+     fill="none"
+     stroke="#ffffff"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-width="2.5"
+     id="path31"
+     style="stroke-width:3;stroke-dasharray:none"
+     sodipodi:nodetypes="ccccccccc" />
+  <path
+     d="m 9.5,16.5 h 1.020564 L 12,15 13,16 15,12.021635 18,17 l 2,-2.5 1.5,2 h 1"
+     fill="none"
+     stroke="#000080"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-width="0.5"
+     id="path33"
+     style="stroke:#3771c8;stroke-width:1;stroke-dasharray:none"
+     sodipodi:nodetypes="ccccccccc" />
 </svg>
diff --git a/image_sources/ccr/components/lazbarcodes/svg (Roland Hahn)/tbarcodemedical 2_150.svg b/image_sources/ccr/components/lazbarcodes/svg (Roland Hahn)/tbarcodemedical 2_150.svg
index 6f3331379..360dcd96f 100644
--- a/image_sources/ccr/components/lazbarcodes/svg (Roland Hahn)/tbarcodemedical 2_150.svg	
+++ b/image_sources/ccr/components/lazbarcodes/svg (Roland Hahn)/tbarcodemedical 2_150.svg	
@@ -8,14 +8,23 @@
    inkscape:export-filename="tbarcodemedical 2_150.png"
    inkscape:export-xdpi="96"
    inkscape:export-ydpi="96"
-   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04, custom)"
+   inkscape:version="1.2-beta (1b65182ce9, 2022-04-05)"
+   xml:space="preserve"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs43" />
-  <sodipodi:namedview
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs43"><linearGradient
+       inkscape:collect="always"
+       xlink:href="#a"
+       id="linearGradient345"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.15636305,0,0,0.15646199,-54.005606,25.133724)"
+       x1="230.26965"
+       y1="-115.89568"
+       x2="271.83875"
+       y2="-42.350357" /></defs><sodipodi:namedview
      id="namedview41"
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -24,95 +33,76 @@
      inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
      showgrid="true"
-     inkscape:zoom="20.694444"
-     inkscape:cx="18.024161"
-     inkscape:cy="18.024161"
-     inkscape:current-layer="svg39">
-    <inkscape:grid
+     inkscape:zoom="25.5"
+     inkscape:cx="18"
+     inkscape:cy="18"
+     inkscape:current-layer="svg39"
+     inkscape:deskcolor="#d1d1d1"><inkscape:grid
        type="xygrid"
-       id="grid860" />
-  </sodipodi:namedview>
-  <linearGradient
+       id="grid860" /></sodipodi:namedview><linearGradient
      id="a"
      gradientTransform="matrix(.15636305 0 0 .15646199 -23.005606 27.133724)"
      gradientUnits="userSpaceOnUse"
      x1="230.26965"
      x2="271.83875"
      y1="-115.89568"
-     y2="-42.350357">
-    <stop
+     y2="-42.350357"><stop
        offset="0"
        stop-color="#f00"
-       id="stop2" />
-    <stop
+       id="stop2" /><stop
        offset="1"
        stop-color="#d40000"
-       id="stop4" />
-  </linearGradient>
-  <path
+       id="stop4" /></linearGradient><path
      d="m0 2.5h34.5v24h-34.5z"
      fill="#fff"
-     id="path7" />
-  <g
+     id="path7" /><g
      fill="none"
      stroke="#000"
      transform="matrix(1.5 0 0 1.5 0 -.5)"
-     id="g27">
-    <path
+     id="g27"><path
        d="m1.5 3v14"
-       id="path9" />
-    <path
+       id="path9" /><path
        d="m3.5 3v14"
-       id="path11" />
-    <path
+       id="path11" /><path
        d="m5.5 3v14"
-       id="path13" />
-    <path
+       id="path13" /><path
        d="m13.5 3v14"
-       id="path15" />
-    <path
+       id="path15" /><path
        d="m21.5 3v14"
-       id="path17" />
-    <path
+       id="path17" /><path
        d="m10.5 3v14"
        stroke-width="3"
-       id="path19" />
-    <path
+       id="path19" /><path
        d="m15.5 3v14"
-       id="path21" />
-    <path
+       id="path21" /><path
        d="m18.5 3v14"
        stroke-width="3"
-       id="path23" />
-    <path
+       id="path23" /><path
        d="m7.5 3v14"
-       id="path25" />
-  </g>
-  <g
-     transform="matrix(1.5 0 0 1.5 -.000309 -.000212)"
-     id="g37">
-    <path
-       d="m12.344755 8.5022106c-4.7724027-.1362496-6.6448889 7.2345394 3.653264 14.8751534 12.674649-9.403817 6.913443-18.3987817 0-13.4924356-1.296271-.9199412-2.551938-1.3512631-3.653264-1.3827178z"
+       id="path25" /></g><g
+     id="g365"
+     transform="matrix(1.5,0,0,1.5,46.499691,2.9997884)"><path
+       d="m -18.655245,6.5022106 c -4.772403,-0.1362496 -6.644889,7.2345394 3.653264,14.8751534 12.674649,-9.403817 6.913443,-18.3987817 0,-13.4924356 -1.296271,-0.9199412 -2.551938,-1.3512631 -3.653264,-1.3827178 z"
        fill="url(#a)"
-       stroke="#fff"
+       stroke="#ffffff"
        stroke-width="1.0003"
-       id="path29" />
-    <g
+       id="path29-1"
+       style="fill:url(#linearGradient345)" /><path
+       d="m -21.5,14.5 h 1.020564 L -19,13 l 1,1 2,-3.978365 3,4.978365 2,-2.5 1.5,2 h 1"
        fill="none"
+       stroke="#ffffff"
        stroke-linecap="round"
        stroke-linejoin="round"
-       transform="matrix(.15813678 0 0 .12863769 -23.441726 24.3855)"
-       id="g35">
-      <path
-         d="m211.47343-53.5263h3.16182l6.32364-7.773771 6.32364 7.773771 12.64728-38.868856 18.97091 54.416399 12.64728-27.2082 6.32364 11.660657h6.32364"
-         stroke="#fff"
-         stroke-width="17.5283"
-         id="path31" />
-      <path
-         d="m211.47343-53.5263h3.16182l6.32364-7.773771 6.32364 7.773771 12.64728-38.868856 18.97091 54.416399 12.64728-27.2082 6.32364 11.660657h6.32364"
-         stroke="#000080"
-         stroke-width="3.50566"
-         id="path33" />
-    </g>
-  </g>
-</svg>
+       stroke-width="2.5"
+       id="path31-8"
+       style="stroke-width:3;stroke-dasharray:none"
+       sodipodi:nodetypes="ccccccccc" /><path
+       d="m -21.5,14.5 h 1.020564 L -19,13 l 1,1 2,-3.978365 3,4.978365 2,-2.5 1.5,2 h 1"
+       fill="none"
+       stroke="#000080"
+       stroke-linecap="round"
+       stroke-linejoin="round"
+       stroke-width="0.5"
+       id="path33-0"
+       style="stroke:#3771c8;stroke-width:1;stroke-dasharray:none"
+       sodipodi:nodetypes="ccccccccc" /></g></svg>
diff --git a/image_sources/ccr/components/lazbarcodes/svg (Roland Hahn)/tbarcodemedical 2_200.svg b/image_sources/ccr/components/lazbarcodes/svg (Roland Hahn)/tbarcodemedical 2_200.svg
index 467646bda..4fb8d0f46 100644
--- a/image_sources/ccr/components/lazbarcodes/svg (Roland Hahn)/tbarcodemedical 2_200.svg	
+++ b/image_sources/ccr/components/lazbarcodes/svg (Roland Hahn)/tbarcodemedical 2_200.svg	
@@ -8,14 +8,23 @@
    inkscape:export-filename="tbarcodemedical 2_200.png"
    inkscape:export-xdpi="96"
    inkscape:export-ydpi="96"
-   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04, custom)"
+   inkscape:version="1.2-beta (1b65182ce9, 2022-04-05)"
+   xml:space="preserve"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs47" />
-  <sodipodi:namedview
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs47"><linearGradient
+       inkscape:collect="always"
+       xlink:href="#a"
+       id="linearGradient347"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.15636305,0,0,0.15646199,-57.005606,26.112089)"
+       x1="230.26965"
+       y1="-115.89568"
+       x2="271.83875"
+       y2="-42.350357" /></defs><sodipodi:namedview
      id="namedview45"
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -24,100 +33,77 @@
      inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
      showgrid="true"
-     inkscape:zoom="15.520833"
-     inkscape:cx="23.967785"
-     inkscape:cy="23.967785"
-     inkscape:current-layer="svg43">
-    <inkscape:grid
+     inkscape:zoom="19.125"
+     inkscape:cx="24"
+     inkscape:cy="24"
+     inkscape:current-layer="svg43"
+     inkscape:deskcolor="#d1d1d1"><inkscape:grid
        type="xygrid"
-       id="grid864" />
-  </sodipodi:namedview>
-  <linearGradient
+       id="grid864" /></sodipodi:namedview><linearGradient
      id="a"
      gradientTransform="matrix(.15636305 0 0 .15646199 -23.005606 27.133724)"
      gradientUnits="userSpaceOnUse"
      x1="230.26965"
      x2="271.83875"
      y1="-115.89568"
-     y2="-42.350357">
-    <stop
+     y2="-42.350357"><stop
        offset="0"
        stop-color="#f00"
-       id="stop2" />
-    <stop
+       id="stop2" /><stop
        offset="1"
        stop-color="#d40000"
-       id="stop4" />
-  </linearGradient>
-  <g
-     id="g41">
-    <path
-       d="m0 4h46v32h-46z"
-       fill="#fff"
-       id="path7" />
-    <g
-       transform="scale(2)"
-       id="g39">
-      <g
-         fill="none"
-         stroke="#000"
-         id="g27">
-        <path
-           d="m1.5 3v14"
-           id="path9" />
-        <path
-           d="m3.5 3v14"
-           id="path11" />
-        <path
-           d="m5.5 3v14"
-           id="path13" />
-        <path
-           d="m13.5 3v14"
-           id="path15" />
-        <path
-           d="m21.5 3v14"
-           id="path17" />
-        <path
-           d="m10.5 3v14"
-           stroke-width="3"
-           id="path19" />
-        <path
-           d="m15.5 3v14"
-           id="path21" />
-        <path
-           d="m18.5 3v14"
-           stroke-width="3"
-           id="path23" />
-        <path
-           d="m7.5 3v14"
-           id="path25" />
-      </g>
-      <g
-         id="g37">
-        <path
-           d="m12.344755 8.5022106c-4.7724027-.1362496-6.6448889 7.2345394 3.653264 14.8751534 12.674649-9.403817 6.913443-18.3987817 0-13.4924356-1.296271-.9199412-2.551938-1.3512631-3.653264-1.3827178z"
-           fill="url(#a)"
-           stroke="#fff"
-           stroke-width="1.0003"
-           id="path29" />
-        <g
-           fill="none"
-           stroke-linecap="round"
-           stroke-linejoin="round"
-           transform="matrix(.15813678 0 0 .12863769 -23.441726 24.3855)"
-           id="g35">
-          <path
-             d="m211.47343-53.5263h3.16182l6.32364-7.773771 6.32364 7.773771 12.64728-38.868856 18.97091 54.416399 12.64728-27.2082 6.32364 11.660657h6.32364"
-             stroke="#fff"
-             stroke-width="17.5283"
-             id="path31" />
-          <path
-             d="m211.47343-53.5263h3.16182l6.32364-7.773771 6.32364 7.773771 12.64728-38.868856 18.97091 54.416399 12.64728-27.2082 6.32364 11.660657h6.32364"
-             stroke="#000080"
-             stroke-width="3.50566"
-             id="path33" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
+       id="stop4" /></linearGradient><g
+     id="g414"><path
+       d="M 0,4 H 46 V 36 H 0 Z"
+       fill="#ffffff"
+       id="path7" /><g
+       fill="none"
+       stroke="#000000"
+       id="g27"
+       transform="scale(2)"><path
+         d="M 1.5,3 V 17"
+         id="path9" /><path
+         d="M 3.5,3 V 17"
+         id="path11" /><path
+         d="M 5.5,3 V 17"
+         id="path13" /><path
+         d="M 13.5,3 V 17"
+         id="path15" /><path
+         d="M 21.5,3 V 17"
+         id="path17" /><path
+         d="M 10.5,3 V 17"
+         stroke-width="3"
+         id="path19" /><path
+         d="M 15.5,3 V 17"
+         id="path21" /><path
+         d="M 18.5,3 V 17"
+         stroke-width="3"
+         id="path23" /><path
+         d="M 7.5,3 V 17"
+         id="path25" /></g></g><g
+     id="g367"
+     transform="matrix(2,0,0,2,67.999589,2.0429879)"><path
+       d="m -21.655245,7.4805756 c -4.772403,-0.1362496 -6.644889,7.2345394 3.653264,14.8751534 12.674649,-9.403817 6.913443,-18.3987817 0,-13.4924356 -1.296271,-0.9199412 -2.551938,-1.3512631 -3.653264,-1.3827178 z"
+       fill="url(#a)"
+       stroke="#ffffff"
+       stroke-width="1.0003"
+       id="path29-0"
+       style="fill:url(#linearGradient347)" /><path
+       d="m -24.5,15.478365 h 1.020564 l 1.479436,-1.5 1,1 L -19,11 l 3,4.978365 2,-2.5 1.5,2 h 1"
+       fill="none"
+       stroke="#ffffff"
+       stroke-linecap="round"
+       stroke-linejoin="round"
+       stroke-width="2.5"
+       id="path31-4"
+       style="stroke-width:3;stroke-dasharray:none"
+       sodipodi:nodetypes="ccccccccc" /><path
+       d="m -24.5,15.478365 h 1.020564 l 1.479436,-1.5 1,1 L -19,11 l 3,4.978365 2,-2.5 1.5,2 h 1"
+       fill="none"
+       stroke="#000080"
+       stroke-linecap="round"
+       stroke-linejoin="round"
+       stroke-width="0.5"
+       id="path33-6"
+       style="stroke:#3771c8;stroke-width:1;stroke-dasharray:none"
+       sodipodi:nodetypes="ccccccccc" /></g></svg>