diff --git a/icons/classes/Humans.svg b/icons/classes/Humans.svg
deleted file mode 100644
index a50b14d..0000000
--- a/icons/classes/Humans.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<path d="M256,64c105.875,0,192,86.125,192,192s-86.125,192-192,192S64,361.875,64,256S150.125,64,256,64 M256,32
-	C132.281,32,32,132.281,32,256s100.281,224,224,224s224-100.281,224-224S379.719,32,256,32L256,32z M192,144
-	c-17.688,0-32,21.5-32,48c0,26.531,14.313,48,32,48s32-21.469,32-48C224,165.5,209.688,144,192,144z M320,144
-	c-17.688,0-32,21.5-32,48c0,26.531,14.313,48,32,48s32-21.469,32-48C352,165.5,337.688,144,320,144z M399.375,292.469
-	c2.469-8.469-2.406-17.344-10.906-19.844c-8.469-2.531-17.344,2.438-19.844,10.875C354.125,333.25,307.813,368,256,368
-	s-98.125-34.75-112.641-84.5c-2.469-8.438-11.25-13.406-19.844-10.875c-8.484,2.5-13.344,11.375-10.875,19.844
-	C131.109,355.781,190.063,400,256,400S380.875,355.781,399.375,292.469z"/>
-</svg>
diff --git a/icons/classes/Skeletons3D.svg b/icons/classes/Skeletons3D.svg
deleted file mode 100644
index 9308b25..0000000
--- a/icons/classes/Skeletons3D.svg
+++ /dev/null
@@ -1,152 +0,0 @@
-<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64"
-   height="64"
-   viewBox="0 0 16.933333 16.933334"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-   sodipodi:docname="Skeletons 3D.svg"
-   inkscape:export-filename="/home/severinlemaignan/src/ros4hri/src/hri_rviz/icons/classes/HriBodies.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6"
-     inkscape:cx="72.399452"
-     inkscape:cy="18.468692"
-     inkscape:document-units="mm"
-     inkscape:current-layer="g883"
-     showgrid="false"
-     inkscape:snap-object-midpoints="true"
-     units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1043"
-     inkscape:window-x="951"
-     inkscape:window-y="1080"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5">
-    <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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-280.06665)">
-    <g
-       id="g883"
-       transform="matrix(0.06140781,0,0,0.06140781,1.2845089,279.74167)">
-      <g
-         id="g921"
-         transform="matrix(1.1314259,0,0,1.1314259,37.420115,3.8236499)">
-        <path
-           style="fill:none;stroke:#000000;stroke-width:14;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 10.086319,42.944954 54.43309,35.526413 66.142261,-1.580694"
-           id="path837"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccc" />
-        <path
-           style="fill:none;stroke:#000000;stroke-width:14;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 70.399338,28.759237 64.51941,78.471365 63.450329,138.33974 32.347343,169.45256"
-           id="path841"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" />
-        <path
-           style="fill:none;stroke:#000000;stroke-width:14;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 32.347343,169.45256 -5.50572,56.55722"
-           id="path843"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cc" />
-        <path
-           style="fill:none;stroke:#000000;stroke-width:14;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 63.450329,138.33974 40.531791,24.16378 17.68882,60.11361"
-           id="path845"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccc" />
-        <g
-           id="g858"
-           style="fill:#000000;stroke:#000000;stroke-width:8;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-          <circle
-             r="10.709345"
-             cy="226.00978"
-             cx="26.841623"
-             id="path815"
-             style="opacity:1;fill:#000000;stroke:#000000;stroke-width:8;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <circle
-             r="10.709345"
-             cy="169.45256"
-             cx="32.347343"
-             id="circle819"
-             style="opacity:1;fill:#000000;stroke:#000000;stroke-width:8;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <circle
-             r="10.709345"
-             cy="138.33974"
-             cx="63.450329"
-             id="circle821"
-             style="opacity:1;fill:#000000;stroke:#000000;stroke-width:8;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <circle
-             r="10.709345"
-             cy="78.471367"
-             cx="64.519409"
-             id="circle823"
-             style="opacity:1;fill:#000000;stroke:#000000;stroke-width:8;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <circle
-             r="18.72743"
-             cy="28.759237"
-             cx="70.399338"
-             id="circle825"
-             style="opacity:1;fill:#000000;stroke:#000000;stroke-width:8;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <circle
-             r="10.709345"
-             cy="76.890671"
-             cx="130.66167"
-             id="circle831"
-             style="opacity:1;fill:#000000;stroke:#000000;stroke-width:8;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <circle
-             r="10.709345"
-             cy="42.944954"
-             cx="10.086319"
-             id="circle833"
-             style="opacity:1;fill:#000000;stroke:#000000;stroke-width:8;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <circle
-             r="10.709345"
-             cy="162.50352"
-             cx="103.98212"
-             id="circle835"
-             style="opacity:1;fill:#000000;stroke:#000000;stroke-width:8;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <circle
-             style="opacity:1;fill:#000000;stroke:#000000;stroke-width:8;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             id="circle817"
-             cx="121.67094"
-             cy="222.61713"
-             r="10.709345" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/icons/classes/TF (HRI).png b/icons/classes/TF_HRI.png
similarity index 100%
rename from icons/classes/TF (HRI).png
rename to icons/classes/TF_HRI.png