diff --git a/main/exercice/MatchingDraggable.php b/main/exercice/MatchingDraggable.php
index 9311ede7e5..f3516052f1 100644
--- a/main/exercice/MatchingDraggable.php
+++ b/main/exercice/MatchingDraggable.php
@@ -10,7 +10,7 @@
 class MatchingDraggable extends Question
 {
 
-    public static $typePicture = 'matching.png';
+    public static $typePicture = 'matchingdrag.png';
     static $explanationLangVar = 'MatchingDraggable';
 
     /**
diff --git a/main/img/icons/128/matching.png b/main/img/icons/128/matching.png
index bd0523ebb0..c10243098f 100644
Binary files a/main/img/icons/128/matching.png and b/main/img/icons/128/matching.png differ
diff --git a/main/img/icons/128/matching_na.png b/main/img/icons/128/matching_na.png
index d61e7439be..c8940a990f 100644
Binary files a/main/img/icons/128/matching_na.png and b/main/img/icons/128/matching_na.png differ
diff --git a/main/img/icons/128/matchingdrag.png b/main/img/icons/128/matchingdrag.png
new file mode 100644
index 0000000000..7002c89e89
Binary files /dev/null and b/main/img/icons/128/matchingdrag.png differ
diff --git a/main/img/icons/128/matchingdrag_na.png b/main/img/icons/128/matchingdrag_na.png
new file mode 100644
index 0000000000..57c1e3eac0
Binary files /dev/null and b/main/img/icons/128/matchingdrag_na.png differ
diff --git a/main/img/icons/128/ordering_na.png b/main/img/icons/128/ordering_na.png
new file mode 100644
index 0000000000..070378644e
Binary files /dev/null and b/main/img/icons/128/ordering_na.png differ
diff --git a/main/img/icons/128/uaimg_na.png b/main/img/icons/128/uaimg_na.png
new file mode 100644
index 0000000000..14a0c2cb75
Binary files /dev/null and b/main/img/icons/128/uaimg_na.png differ
diff --git a/main/img/icons/22/matching.png b/main/img/icons/22/matching.png
index 0cc253e49d..76f4abce55 100644
Binary files a/main/img/icons/22/matching.png and b/main/img/icons/22/matching.png differ
diff --git a/main/img/icons/22/matching_na.png b/main/img/icons/22/matching_na.png
index 9e024533fa..76f4abce55 100644
Binary files a/main/img/icons/22/matching_na.png and b/main/img/icons/22/matching_na.png differ
diff --git a/main/img/icons/22/matchingdrag.png b/main/img/icons/22/matchingdrag.png
new file mode 100644
index 0000000000..e093b6f66e
Binary files /dev/null and b/main/img/icons/22/matchingdrag.png differ
diff --git a/main/img/icons/22/matchingdrag_na.png b/main/img/icons/22/matchingdrag_na.png
new file mode 100644
index 0000000000..e093b6f66e
Binary files /dev/null and b/main/img/icons/22/matchingdrag_na.png differ
diff --git a/main/img/icons/22/ordering_na.png b/main/img/icons/22/ordering_na.png
new file mode 100644
index 0000000000..76bf744643
Binary files /dev/null and b/main/img/icons/22/ordering_na.png differ
diff --git a/main/img/icons/22/uaimg_na.png b/main/img/icons/22/uaimg_na.png
new file mode 100644
index 0000000000..ae847b6c17
Binary files /dev/null and b/main/img/icons/22/uaimg_na.png differ
diff --git a/main/img/icons/32/matching.png b/main/img/icons/32/matching.png
index bc9d0b8210..88c91c2524 100644
Binary files a/main/img/icons/32/matching.png and b/main/img/icons/32/matching.png differ
diff --git a/main/img/icons/32/matching_na.png b/main/img/icons/32/matching_na.png
index cd5b1d89d9..ce86c56157 100644
Binary files a/main/img/icons/32/matching_na.png and b/main/img/icons/32/matching_na.png differ
diff --git a/main/img/icons/32/matchingdrag.png b/main/img/icons/32/matchingdrag.png
new file mode 100644
index 0000000000..106ca31fff
Binary files /dev/null and b/main/img/icons/32/matchingdrag.png differ
diff --git a/main/img/icons/32/matchingdrag_na.png b/main/img/icons/32/matchingdrag_na.png
new file mode 100644
index 0000000000..3be84cedde
Binary files /dev/null and b/main/img/icons/32/matchingdrag_na.png differ
diff --git a/main/img/icons/32/ordering_na.png b/main/img/icons/32/ordering_na.png
new file mode 100644
index 0000000000..9d3e14fd66
Binary files /dev/null and b/main/img/icons/32/ordering_na.png differ
diff --git a/main/img/icons/32/uaimg_na.png b/main/img/icons/32/uaimg_na.png
new file mode 100644
index 0000000000..100c668ce1
Binary files /dev/null and b/main/img/icons/32/uaimg_na.png differ
diff --git a/main/img/icons/48/matching.png b/main/img/icons/48/matching.png
index a3448e9676..8034238dee 100644
Binary files a/main/img/icons/48/matching.png and b/main/img/icons/48/matching.png differ
diff --git a/main/img/icons/48/matching_na.png b/main/img/icons/48/matching_na.png
index 2b7c16661d..5b6b0da36e 100644
Binary files a/main/img/icons/48/matching_na.png and b/main/img/icons/48/matching_na.png differ
diff --git a/main/img/icons/48/matchingdrag.png b/main/img/icons/48/matchingdrag.png
new file mode 100644
index 0000000000..7dba70aaf8
Binary files /dev/null and b/main/img/icons/48/matchingdrag.png differ
diff --git a/main/img/icons/48/matchingdrag_na.png b/main/img/icons/48/matchingdrag_na.png
new file mode 100644
index 0000000000..c5ba906f8b
Binary files /dev/null and b/main/img/icons/48/matchingdrag_na.png differ
diff --git a/main/img/icons/48/ordering_na.png b/main/img/icons/48/ordering_na.png
new file mode 100644
index 0000000000..7128b3efd6
Binary files /dev/null and b/main/img/icons/48/ordering_na.png differ
diff --git a/main/img/icons/48/uaimg_na.png b/main/img/icons/48/uaimg_na.png
new file mode 100644
index 0000000000..b49e48f0ae
Binary files /dev/null and b/main/img/icons/48/uaimg_na.png differ
diff --git a/main/img/icons/64/matching.png b/main/img/icons/64/matching.png
index 68c4eb2b88..43de028bfc 100644
Binary files a/main/img/icons/64/matching.png and b/main/img/icons/64/matching.png differ
diff --git a/main/img/icons/64/matching_na.png b/main/img/icons/64/matching_na.png
index 1e464de3be..b7e25d7c2c 100644
Binary files a/main/img/icons/64/matching_na.png and b/main/img/icons/64/matching_na.png differ
diff --git a/main/img/icons/64/matchingdrag.png b/main/img/icons/64/matchingdrag.png
new file mode 100644
index 0000000000..b44f56291a
Binary files /dev/null and b/main/img/icons/64/matchingdrag.png differ
diff --git a/main/img/icons/64/matchingdrag_na.png b/main/img/icons/64/matchingdrag_na.png
new file mode 100644
index 0000000000..cc36e9c757
Binary files /dev/null and b/main/img/icons/64/matchingdrag_na.png differ
diff --git a/main/img/icons/64/ordering_na.png b/main/img/icons/64/ordering_na.png
new file mode 100644
index 0000000000..42813008b4
Binary files /dev/null and b/main/img/icons/64/ordering_na.png differ
diff --git a/main/img/icons/64/uaimg_na.png b/main/img/icons/64/uaimg_na.png
new file mode 100644
index 0000000000..b2aaaa6b1e
Binary files /dev/null and b/main/img/icons/64/uaimg_na.png differ
diff --git a/main/img/icons/svg/matching.svg b/main/img/icons/svg/matching.svg
index 34f7dfbda8..c6fdf5b4a3 100644
--- a/main/img/icons/svg/matching.svg
+++ b/main/img/icons/svg/matching.svg
@@ -14,82 +14,16 @@
    height="124"
    id="svg7613"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="fill_in_blanks.svg">
+   inkscape:version="0.91 r"
+   sodipodi:docname="matching.svg">
   <defs
      id="defs7615">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4799"
-       id="radialGradient7559"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55758631,0,0,0.57073983,33.783815,180.81737)"
-       cx="55.21796"
-       cy="458.46527"
-       fx="55.21796"
-       fy="458.46527"
-       r="15.213428" />
-    <linearGradient
-       id="linearGradient4799">
-      <stop
-         style="stop-color:#ffde00;stop-opacity:1;"
-         offset="0"
-         id="stop4801" />
-      <stop
-         style="stop-color:#ffa700;stop-opacity:1;"
-         offset="1"
-         id="stop4803" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4799-9"
-       id="radialGradient7557"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55758631,0,0,0.57073983,104.95785,180.81737)"
-       cx="55.21796"
-       cy="458.46527"
-       fx="55.21796"
-       fy="458.46527"
-       r="15.213428" />
-    <linearGradient
-       id="linearGradient4799-9">
-      <stop
-         style="stop-color:#ffde00;stop-opacity:1;"
-         offset="0"
-         id="stop4801-0" />
-      <stop
-         style="stop-color:#ffa700;stop-opacity:1;"
-         offset="1"
-         id="stop4803-9" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4799-6"
-       id="radialGradient7511"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55758631,0,0,0.57073983,176.13186,180.81737)"
-       cx="55.21796"
-       cy="458.46527"
-       fx="55.21796"
-       fy="458.46527"
-       r="15.213428" />
-    <linearGradient
-       id="linearGradient4799-6">
-      <stop
-         style="stop-color:#ffde00;stop-opacity:1;"
-         offset="0"
-         id="stop4801-8" />
-      <stop
-         style="stop-color:#ffa700;stop-opacity:1;"
-         offset="1"
-         id="stop4803-96" />
-    </linearGradient>
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient4799-2"
        id="radialGradient7503"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55758631,0,0,0.57073983,246.94993,180.81737)"
+       gradientTransform="matrix(1.0803234,0,0,1.1058083,-31.65926,522.33259)"
        cx="55.21796"
        cy="458.46527"
        fx="55.21796"
@@ -114,16 +48,16 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.0887097"
-     inkscape:cx="62"
-     inkscape:cy="73.285552"
+     inkscape:zoom="4.7615658"
+     inkscape:cx="66.838035"
+     inkscape:cy="44.354949"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1871"
-     inkscape:window-height="1056"
-     inkscape:window-x="1415"
-     inkscape:window-y="24"
+     inkscape:window-width="1920"
+     inkscape:window-height="1051"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata7618">
@@ -143,122 +77,201 @@
      id="layer1"
      transform="translate(0,-928.36218)">
     <g
-       id="matching"
-       transform="matrix(1.9374998,0,0,1.9374998,-510.1247,171.99897)"
-       inkscape:label="#g6870"
-       inkscape:export-filename="/home/aragonc/Escritorio/icons_answer/32/matching.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
+       id="g8975"
+       inkscape:export-xdpi="92.903244"
+       inkscape:export-ydpi="92.903244"
+       inkscape:export-filename="/var/www/chamilo/main/img/icons/128/matching_na.png">
       <rect
          style="opacity:0;fill:#ffffff;fill-opacity:1;stroke:none"
          id="rect4392"
-         width="64"
-         height="64"
-         x="263.39941"
-         y="390.05341" />
+         width="123.99998"
+         height="123.99998"
+         x="0.21161206"
+         y="927.72736" />
       <rect
          style="fill:#2d404e;fill-opacity:1;stroke:none"
          id="rect4394"
-         width="42.888599"
-         height="53.322857"
-         x="274.96954"
-         y="395.96347"
-         ry="3.2374587" />
+         width="83.096649"
+         height="103.31303"
+         x="22.628735"
+         y="939.1781"
+         ry="6.2725754" />
       <rect
-         ry="3.2374587"
-         y="394.68195"
-         x="273.68802"
-         height="53.322857"
-         width="42.888599"
+         ry="6.2725754"
+         y="936.69519"
+         x="20.145782"
+         height="103.31303"
+         width="83.096649"
          id="rect4396"
-         style="fill:#ffffff;fill-opacity:1;stroke:#70acc7;stroke-opacity:1" />
-      <rect
-         style="fill:#ffffff;fill-opacity:1;stroke:#006192;stroke-width:0.64576805;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect4438"
-         width="12.354232"
-         height="7.3542318"
-         x="299.96765"
-         y="417.55923"
-         ry="1.6959299" />
-      <rect
-         ry="1.6959299"
-         y="403.89511"
-         x="299.85977"
-         height="7.3542318"
-         width="12.354232"
-         id="rect4440"
-         style="fill:#ffffff;fill-opacity:1;stroke:#006192;stroke-width:0.64576805;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <rect
-         ry="0.9632234"
-         y="403.84402"
-         x="279.4603"
-         height="20.585283"
-         width="7.0656476"
-         id="rect5030"
-         style="fill:#2f7ea6;fill-opacity:1;stroke:#2f7ea6;stroke-width:1.26269329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-      <text
-         xml:space="preserve"
-         style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial Bold"
-         x="280.70346"
-         y="409.98184"
-         id="text4454"
-         sodipodi:linespacing="125%"><tspan
-           sodipodi:role="line"
-           id="tspan4456"
-           x="280.70346"
-           y="409.98184">a</tspan></text>
-      <text
-         sodipodi:linespacing="125%"
-         id="text4458"
-         y="422.79608"
-         x="280.7543"
-         style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial Bold"
-         xml:space="preserve"><tspan
-           y="422.79608"
-           x="280.7543"
-           id="tspan4460"
-           sodipodi:role="line">b</tspan></text>
-      <text
-         sodipodi:linespacing="125%"
-         id="text4478"
-         y="423.31058"
-         x="303.91235"
-         style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#1a1a1a;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial Bold"
-         xml:space="preserve"><tspan
-           y="423.31058"
-           x="303.91235"
-           id="tspan4480"
-           sodipodi:role="line">a</tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#1a1a1a;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial Bold"
-         x="303.48416"
-         y="410.38864"
-         id="text4498"
-         sodipodi:linespacing="125%"><tspan
-           sodipodi:role="line"
-           id="tspan4500"
-           x="303.48416"
-           y="410.38864">b</tspan></text>
+         style="fill:#ffffff;fill-opacity:1;stroke:#70acc7;stroke-width:1.93749976;stroke-opacity:1" />
       <path
-         style="fill:url(#radialGradient7503);fill-opacity:1;stroke:#ff4100;stroke-width:0.83637941;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 276.91942,439.96834 -0.0284,-5.07522 c 0.0325,-1.11444 2.04678,-1.05051 2.18321,-0.0285 l 0,5.01854 3.37405,-3.4024 c 0.82795,-0.77673 2.03232,0.58656 1.30425,1.36097 l -3.14722,3.54417 4.42312,0.0284 c 1.29025,0.16752 1.12763,2.29901 0.0567,2.38169 l -4.28135,-0.0284 3.23228,3.11887 c 0.76312,0.85437 -0.25495,2.33446 -1.38931,1.58778 l -3.62923,-3.48746 -0.0284,5.01853 c 0.12831,1.06573 -2.05583,1.26709 -2.26827,0.0284 l 0.0284,-4.76338 -3.20393,3.20394 c -1.1279,0.27764 -2.0538,-0.52426 -1.61614,-1.50274 l 3.4024,-3.26063 -4.90513,0.0568 c -1.20828,-0.23463 -1.17896,-2.22438 0.0284,-2.38168 l 5.01854,-0.0284 -3.51581,-3.4591 c -0.68404,-1.08866 0.48965,-2.19074 1.41767,-1.53108 z"
+         style="fill:url(#radialGradient7503);fill-opacity:1;stroke:#ff4100;stroke-width:1.62048495;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 26.406621,1024.4375 -0.05503,-9.8332 c 0.06297,-2.1592 3.965636,-2.0354 4.229969,-0.055 l 0,9.7234 6.537221,-6.5921 c 1.604153,-1.505 3.93762,1.1364 2.526984,2.6368 l -6.097738,6.8669 8.569794,0.055 c 2.499859,0.3246 2.184783,4.4543 0.109856,4.6145 l -8.295114,-0.055 6.262541,6.0428 c 1.478545,1.6553 -0.493965,4.523 -2.691787,3.0763 l -7.031633,-6.7569 -0.05503,9.7234 c 0.248601,2.0648 -3.98317,2.455 -4.394772,0.055 l 0.05503,-9.2291 -6.207614,6.2077 c -2.185306,0.5379 -3.979237,-1.0158 -3.131271,-2.9116 l 6.592149,-6.3174 -9.503688,0.11 c -2.341042,-0.4546 -2.284235,-4.3097 0.05503,-4.6145 l 9.72342,-0.055 -6.811881,-6.702 c -1.325328,-2.1093 0.948697,-4.2446 2.746735,-2.9665 z"
          id="path5144"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="ccccccccccccccccccccccccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         transform="translate(0,308.2677)"
-         inkscape:connector-curvature="0"
-         id="path6776"
-         d="m 285.78215,99.682329 4.17096,0 8.41382,13.088161 3.95521,0.0719"
-         style="fill:none;stroke:#ff6400;stroke-width:1.39999998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         style="fill:none;stroke:#2f7ea6;stroke-width:1.39999998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 286.75739,421.11009 3.19572,0 8.41382,-13.08816 3.95521,-0.0719"
-         id="path6779"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
+      <g
+         id="g8843">
+        <rect
+           style="fill:#2f7ea6;fill-opacity:1;stroke:#2f7ea6;stroke-width:3.27470207;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect5030"
+           width="16.043436"
+           height="60.976059"
+           x="32.329472"
+           y="949.67877"
+           ry="2.8531823" />
+        <g
+           id="g8835"
+           transform="translate(0.35355091,0.97222086)">
+          <text
+             xml:space="preserve"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:15.49999809px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none"
+             x="35.411213"
+             y="961.60223"
+             id="text4454"
+             sodipodi:linespacing="125%"><tspan
+               sodipodi:role="line"
+               id="tspan4456"
+               x="35.411213"
+               y="961.60223">a</tspan></text>
+          <text
+             sodipodi:linespacing="125%"
+             id="text4458"
+             y="984.42377"
+             x="35.070637"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:15.49999809px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none"
+             xml:space="preserve"><tspan
+               y="984.42377"
+               x="35.070637"
+               id="tspan4460"
+               sodipodi:role="line">b</tspan></text>
+          <text
+             xml:space="preserve"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.75px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial, Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none"
+             x="34.93874"
+             y="1004.993"
+             id="text7988"
+             sodipodi:linespacing="125%"><tspan
+               sodipodi:role="line"
+               id="tspan7990"
+               x="34.93874"
+               y="1004.993">C</tspan></text>
+        </g>
+      </g>
+      <g
+         id="g8946">
+        <g
+           id="g8924"
+           transform="translate(-0.10450745,0)">
+          <path
+             sodipodi:nodetypes="csssscc"
+             inkscape:connector-curvature="0"
+             id="rect8010"
+             d="m 90.98199,1010.8626 0,14.9481 c 0,1.5636 -1.273429,2.8223 -2.855221,2.8223 l -18.190682,0 c -1.581793,0 -2.855222,-1.2587 -2.855222,-2.8223 l 0,-14.9481 z"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#2f7ea6;stroke-width:0.90827322;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+          <rect
+             ry="3.2303987"
+             y="999.26459"
+             x="67.058411"
+             height="14.008304"
+             width="23.944626"
+             id="rect8000"
+             style="fill:#70acc7;fill-opacity:1;stroke:#2f7ea6;stroke-width:0.99169606;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          <path
+             style="opacity:1;fill:#2f7ea6;fill-opacity:1;stroke:none"
+             d="m 81.746646,998.77046 6.166613,0.0326 c 2.023828,0.0107 3.646961,1.91764 3.635983,3.80824 l -0.04419,7.6108 c -0.0084,1.4466 -1.425606,3.5518 -3.470255,3.5483 l -6.288147,-0.011 z"
+             id="path8006"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="csssscc" />
+          <path
+             style="fill:#ffffff;stroke:none"
+             d="m 82.97023,1004.8286 3.227255,3.8024 3.192599,-3.8031 z"
+             id="path8008"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="cccc" />
+          <text
+             xml:space="preserve"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:15.49999809px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#1a1a1a;fill-opacity:1;stroke:none"
+             x="74.053772"
+             y="1026.0408"
+             id="text8002"
+             sodipodi:linespacing="125%"><tspan
+               sodipodi:role="line"
+               id="tspan8004"
+               x="74.053772"
+               y="1026.0408">b</tspan></text>
+        </g>
+        <g
+           id="g8932"
+           transform="translate(-0.10450745,0)">
+          <rect
+             style="fill:#ffffff;fill-opacity:1;stroke:#2f7ea6;stroke-width:0.99169606;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect4438"
+             width="23.944626"
+             height="14.008304"
+             x="67.058411"
+             y="975.26459"
+             ry="3.2303987" />
+          <text
+             sodipodi:linespacing="125%"
+             id="text4478"
+             y="986.16315"
+             x="70.705421"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:15.49999809px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#1a1a1a;fill-opacity:1;stroke:none"
+             xml:space="preserve"><tspan
+               y="986.16315"
+               x="70.705421"
+               id="tspan4480"
+               sodipodi:role="line">a</tspan></text>
+          <path
+             sodipodi:nodetypes="csssscc"
+             inkscape:connector-curvature="0"
+             id="path8819"
+             d="m 81.746646,974.7704 6.166613,0.0326 c 2.023828,0.0107 3.646961,1.91768 3.635983,3.80827 l -0.04419,7.61089 c -0.0084,1.44661 -1.425606,3.55181 -3.470255,3.54828 l -6.288147,-0.0108 z"
+             style="opacity:1;fill:#2f7ea6;fill-opacity:1;stroke:none" />
+          <path
+             sodipodi:nodetypes="cccc"
+             inkscape:connector-curvature="0"
+             id="path8821"
+             d="m 82.97023,980.8286 3.227255,3.80236 3.192599,-3.80305 z"
+             style="fill:#ffffff;stroke:none" />
+        </g>
+        <g
+           id="g8939"
+           transform="translate(0.046875,0)">
+          <rect
+             ry="3.2303987"
+             y="950.79034"
+             x="66.849396"
+             height="14.008304"
+             width="23.944626"
+             id="rect4440"
+             style="fill:#ffffff;fill-opacity:1;stroke:#2f7ea6;stroke-width:0.99169606;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          <text
+             xml:space="preserve"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12.6751709px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#1a1a1a;fill-opacity:1;stroke:none"
+             x="70.158257"
+             y="962.03333"
+             id="text4498"
+             sodipodi:linespacing="125%"><tspan
+               sodipodi:role="line"
+               id="tspan4500"
+               x="70.158257"
+               y="962.03333">C</tspan></text>
+          <path
+             style="opacity:1;fill:#2f7ea6;fill-opacity:1;stroke:none"
+             d="m 81.652896,950.30165 6.166613,0.0326 c 2.023828,0.0107 3.646961,1.91768 3.635983,3.80827 l -0.04419,7.61089 c -0.0084,1.44661 -1.425606,3.55181 -3.470255,3.54828 l -6.288147,-0.0108 z"
+             id="path8825"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="csssscc" />
+          <path
+             style="fill:#ffffff;stroke:none"
+             d="m 82.87648,956.35985 3.227255,3.80236 3.192599,-3.80305 z"
+             id="path8827"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="cccc" />
+        </g>
+      </g>
     </g>
   </g>
 </svg>
diff --git a/main/img/icons/svg/matchingdrag.svg b/main/img/icons/svg/matchingdrag.svg
new file mode 100644
index 0000000000..7b88638175
--- /dev/null
+++ b/main/img/icons/svg/matchingdrag.svg
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="124"
+   height="124"
+   id="svg7613"
+   version="1.1"
+   inkscape:version="0.91 r"
+   sodipodi:docname="matchingdrag.svg">
+  <defs
+     id="defs7615">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4799"
+       id="radialGradient7559"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.55758631,0,0,0.57073983,33.783815,180.81737)"
+       cx="55.21796"
+       cy="458.46527"
+       fx="55.21796"
+       fy="458.46527"
+       r="15.213428" />
+    <linearGradient
+       id="linearGradient4799">
+      <stop
+         style="stop-color:#ffde00;stop-opacity:1;"
+         offset="0"
+         id="stop4801" />
+      <stop
+         style="stop-color:#ffa700;stop-opacity:1;"
+         offset="1"
+         id="stop4803" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4799-9"
+       id="radialGradient7557"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.55758631,0,0,0.57073983,104.95785,180.81737)"
+       cx="55.21796"
+       cy="458.46527"
+       fx="55.21796"
+       fy="458.46527"
+       r="15.213428" />
+    <linearGradient
+       id="linearGradient4799-9">
+      <stop
+         style="stop-color:#ffde00;stop-opacity:1;"
+         offset="0"
+         id="stop4801-0" />
+      <stop
+         style="stop-color:#ffa700;stop-opacity:1;"
+         offset="1"
+         id="stop4803-9" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4799-6"
+       id="radialGradient7511"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.55758631,0,0,0.57073983,176.13186,180.81737)"
+       cx="55.21796"
+       cy="458.46527"
+       fx="55.21796"
+       fy="458.46527"
+       r="15.213428" />
+    <linearGradient
+       id="linearGradient4799-6">
+      <stop
+         style="stop-color:#ffde00;stop-opacity:1;"
+         offset="0"
+         id="stop4801-8" />
+      <stop
+         style="stop-color:#ffa700;stop-opacity:1;"
+         offset="1"
+         id="stop4803-96" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4799-2"
+       id="radialGradient7503"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.55758631,0,0,0.57073983,246.94993,180.81737)"
+       cx="55.21796"
+       cy="458.46527"
+       fx="55.21796"
+       fy="458.46527"
+       r="15.213428" />
+    <linearGradient
+       id="linearGradient4799-2">
+      <stop
+         style="stop-color:#ffde00;stop-opacity:1;"
+         offset="0"
+         id="stop4801-4" />
+      <stop
+         style="stop-color:#ffa700;stop-opacity:1;"
+         offset="1"
+         id="stop4803-8" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.0124747"
+     inkscape:cx="90.491703"
+     inkscape:cy="45.49601"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1051"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7618">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-928.36218)">
+    <g
+       id="matching"
+       transform="matrix(1.9374998,0,0,1.9374998,-510.30104,172.66905)"
+       inkscape:label="#g6870"
+       inkscape:export-filename="/var/www/chamilo/main/img/icons/128/matchingdrag_na.png"
+       inkscape:export-xdpi="92.903229"
+       inkscape:export-ydpi="92.903229">
+      <rect
+         style="opacity:0;fill:#ffffff;fill-opacity:1;stroke:none"
+         id="rect4392"
+         width="64"
+         height="64"
+         x="263.39941"
+         y="390.05341" />
+      <rect
+         style="fill:#2d404e;fill-opacity:1;stroke:none"
+         id="rect4394"
+         width="42.888599"
+         height="53.322857"
+         x="274.96954"
+         y="395.96347"
+         ry="3.2374587" />
+      <rect
+         ry="3.2374587"
+         y="394.68195"
+         x="273.68802"
+         height="53.322857"
+         width="42.888599"
+         id="rect4396"
+         style="fill:#ffffff;fill-opacity:1;stroke:#70acc7;stroke-opacity:1" />
+      <rect
+         style="fill:#ffffff;fill-opacity:1;stroke:#006192;stroke-width:0.64576805;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect4438"
+         width="12.354232"
+         height="7.3542318"
+         x="299.96765"
+         y="417.55923"
+         ry="1.6959299" />
+      <rect
+         ry="1.6959299"
+         y="403.89511"
+         x="299.85977"
+         height="7.3542318"
+         width="12.354232"
+         id="rect4440"
+         style="fill:#ffffff;fill-opacity:1;stroke:#006192;stroke-width:0.64576805;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <rect
+         ry="0.9632234"
+         y="403.84402"
+         x="279.4603"
+         height="20.585283"
+         width="7.0656476"
+         id="rect5030"
+         style="fill:#2f7ea6;fill-opacity:1;stroke:#2f7ea6;stroke-width:1.26269329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:8px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none"
+         x="280.70346"
+         y="409.98184"
+         id="text4454"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan4456"
+           x="280.70346"
+           y="409.98184">a</tspan></text>
+      <text
+         sodipodi:linespacing="125%"
+         id="text4458"
+         y="422.79608"
+         x="280.7543"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:8px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none"
+         xml:space="preserve"><tspan
+           y="422.79608"
+           x="280.7543"
+           id="tspan4460"
+           sodipodi:role="line">b</tspan></text>
+      <text
+         sodipodi:linespacing="125%"
+         id="text4478"
+         y="423.31058"
+         x="303.91235"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:8px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#1a1a1a;fill-opacity:1;stroke:none"
+         xml:space="preserve"><tspan
+           y="423.31058"
+           x="303.91235"
+           id="tspan4480"
+           sodipodi:role="line">a</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:8px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#1a1a1a;fill-opacity:1;stroke:none"
+         x="303.48416"
+         y="410.38864"
+         id="text4498"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan4500"
+           x="303.48416"
+           y="410.38864">b</tspan></text>
+      <path
+         style="fill:url(#radialGradient7503);fill-opacity:1;stroke:#ff4100;stroke-width:0.83637941;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 276.91942,439.96834 -0.0284,-5.07522 c 0.0325,-1.11444 2.04678,-1.05051 2.18321,-0.0285 l 0,5.01854 3.37405,-3.4024 c 0.82795,-0.77673 2.03232,0.58656 1.30425,1.36097 l -3.14722,3.54417 4.42312,0.0284 c 1.29025,0.16752 1.12763,2.29901 0.0567,2.38169 l -4.28135,-0.0284 3.23228,3.11887 c 0.76312,0.85437 -0.25495,2.33446 -1.38931,1.58778 l -3.62923,-3.48746 -0.0284,5.01853 c 0.12831,1.06573 -2.05583,1.26709 -2.26827,0.0284 l 0.0284,-4.76338 -3.20393,3.20394 c -1.1279,0.27764 -2.0538,-0.52426 -1.61614,-1.50274 l 3.4024,-3.26063 -4.90513,0.0568 c -1.20828,-0.23463 -1.17896,-2.22438 0.0284,-2.38168 l 5.01854,-0.0284 -3.51581,-3.4591 c -0.68404,-1.08866 0.48965,-2.19074 1.41767,-1.53108 z"
+         id="path5144"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccccccccccccccccccc" />
+      <path
+         sodipodi:nodetypes="cccc"
+         transform="translate(0,308.2677)"
+         inkscape:connector-curvature="0"
+         id="path6776"
+         d="m 285.78215,99.682329 4.17096,0 8.41382,13.088161 3.95521,0.0719"
+         style="fill:none;stroke:#ff6400;stroke-width:1.39999998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         style="fill:none;stroke:#2f7ea6;stroke-width:1.39999998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 286.75739,421.11009 3.19572,0 8.41382,-13.08816 3.95521,-0.0719"
+         id="path6779"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+    </g>
+  </g>
+</svg>
diff --git a/main/img/icons/svg/ordering.svg b/main/img/icons/svg/ordering.svg
index fd49724b2d..7971e94c63 100644
--- a/main/img/icons/svg/ordering.svg
+++ b/main/img/icons/svg/ordering.svg
@@ -60,7 +60,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="4.1852206"
-     inkscape:cx="39.849577"
+     inkscape:cx="-3.0023008"
      inkscape:cy="56.856152"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -88,7 +88,10 @@
      id="layer1"
      transform="translate(0,-928.36218)">
     <g
-       id="g6893">
+       id="g6893"
+       inkscape:export-filename="/var/www/chamilo/main/img/icons/22/ordering_na.png"
+       inkscape:export-xdpi="15.967745"
+       inkscape:export-ydpi="15.967745">
       <rect
          style="opacity:0;fill:#ffffff;fill-opacity:1;stroke:none"
          id="rect4392"
diff --git a/main/img/icons/svg/uaimg.svg b/main/img/icons/svg/uaimg.svg
index 7356d2b7b3..4c5e6664c6 100644
--- a/main/img/icons/svg/uaimg.svg
+++ b/main/img/icons/svg/uaimg.svg
@@ -571,8 +571,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="4"
-     inkscape:cx="33.299296"
-     inkscape:cy="57.041415"
+     inkscape:cx="73.375"
+     inkscape:cy="52.791415"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -589,7 +589,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -600,9 +600,9 @@
      transform="translate(0,-928.36218)">
     <g
        id="g4555"
-       inkscape:export-filename="/var/www/chamilo/main/img/icons/16/uaimg.png"
-       inkscape:export-xdpi="11.612906"
-       inkscape:export-ydpi="11.612906">
+       inkscape:export-filename="/var/www/chamilo/main/img/icons/22/uaimg_na.png"
+       inkscape:export-xdpi="15.967745"
+       inkscape:export-ydpi="15.967745">
       <rect
          y="928.36218"
          x="6.0792113e-06"