diff --git a/wise-editor/src/main/webapp/c/export.bin b/wise-editor/src/main/webapp/c/export.bin
deleted file mode 100644
index efa4f251..00000000
Binary files a/wise-editor/src/main/webapp/c/export.bin and /dev/null differ
diff --git a/wise-editor/src/main/webapp/c/export.htm b/wise-editor/src/main/webapp/c/export.htm
index 4e761788..c1f5f070 100644
--- a/wise-editor/src/main/webapp/c/export.htm
+++ b/wise-editor/src/main/webapp/c/export.htm
@@ -1,24 +1,18 @@
 <div class="modalDialog">
-    <!--  Header can be customized -->
-
-
-    <h1>
-        Export
-        'sss'</h1>
+    <h1>Export</h1>
 
     <div>
-        <form method="post" id="exportForm" name="exportForm" action="export.bin" style="height:100%;">
-            <input type="hidden" name="action" value="export">
-            <input type="hidden" name="mapId" value="3">
-            <input type="hidden" name="mapSvg" value="">
+        <form method="POST" id="exportForm" name="exportForm" action="http://localhost:8080/service/transform"
+              style="height:100%;" enctype="application/x-www-form-urlencoded">
+            <input name="svgXml" value="" type="hidden"/>
+            <input name="mapXml" value="" type="hidden"/>
+            <input name="filename" value="welcome" type="hidden"/>
             <table>
                 <tbody>
                 <tr>
                     <td>
-                        <input type="radio" id="svg" name="exportFormat" value="SVG">
-                        <b>
-                            Scalable Vector Graphics (SVG)
-                        </b>
+                        <input type="radio" id="svg" name="exportFormat" value="svg">
+                        <b> Scalable Vector Graphics (SVG)</b>
 
                         <p>
                             Scalable Vector Graphics (SVG) is an XML markup language for describing two-dimensional
@@ -30,9 +24,7 @@
                 <tr>
                     <td>
                         <input type="radio" name="exportFormat" value="PDF" id="pdf">
-                        <b>
-                            Portable Document Format (PDF)
-                        </b>
+                        <b>Portable Document Format (PDF)</b>
 
                         <p>
                             Get your map as Portable Document Format(PDF) to share use in your presentations.
@@ -42,9 +34,7 @@
                 <tr>
                     <td>
                         <input type="radio" id="freemind" name="exportFormat" value="FREEMIND" checked="checked">
-                        <b>
-                            Freemind (version 0.9.0)
-                        </b>
+                        <b>Freemind (version 0.9.0)</b>
 
                         <p>
                             FreeMind is a nice desktop mind mapping application that has the great benefit of being
@@ -55,12 +45,11 @@
                 <tr>
                     <td>
                         <input type="radio" name="exportFormat" id="img" value="IMG_EXPORT_FORMAT">
-                        <b>
-                            Image File
-                        </b><select name="imgFormat" id="imgFormat" style="visibility:hidden;margin-left:5px;">
-                        <option>PNG</option>
-                        <option>JPEG</option>
-                    </select>
+                        <b>Image File</b>
+                        <select name="imgFormat" id="imgFormat" style="visibility:hidden;margin-left:5px;">
+                            <option>PNG</option>
+                            <option>JPEG</option>
+                        </select>
 
                         <p>
                             Get a graphic representation of your map including all colors and shapes to reuse in
@@ -71,7 +60,8 @@
                 <tr>
                     <td style="text-align:center;margin-top:10px;">
                         <input type="button" id="ok" value="Ok" class="btn-primary">
-                        <input type="button" value="Cancel" class="btn-secondary" onclick="MOOdalBox.close();">
+                        <input type="button" value="Cancel" class="btn-secondary"
+                               onclick="MooDialog.Request.active.close();">
                     </td>
                 </tr>
                 </tbody>
@@ -92,9 +82,36 @@
     });
 
     $('ok').addEvent('click', function(event) {
-        $('exportForm').submit();
+
+        var form = $('exportForm');
+
+        // Look for the selected format and append export suffix...
+        var value = $$('input[name=exportFormat]:checked')[0].get('value');
+        var suffix;
+        if (value == 'IMG_EXPORT_FORMAT') {
+            var selected = $('imgFormat');
+            suffix = selected.options[selected.selectedIndex].value;
+        } else {
+            suffix = value;
+        }
+        suffix = suffix.toLowerCase();
+        form.action = form.action + "." + suffix;
+
+        // Store SVG o native map...
+        if (suffix == "freemind") {
+            var mindmap = designer.getMindmap();
+            var serializer = mindplot.XMLMindmapSerializerFactory.getSerializerFromMindmap(mindmap);
+            var domMap = serializer.toXML(mindmap);
+            form.mapXml.value = core.Utils.innerXML(domMap);
+        } else {
+            form.svgXml.value = $("workspaceContainer").innerHTML;
+        }
+
+        // Finally, submit map ...
+        form.submit();
+
+
         MooDialog.Request.active.close();
     });
-    document.exportForm.mapSvg.value = $("workspaceContainer").innerHTML;
 
 </script>
\ No newline at end of file
diff --git a/wise-editor/src/main/webapp/html/editor.html b/wise-editor/src/main/webapp/html/editor.html
index 6e0d17a9..3c749a42 100644
--- a/wise-editor/src/main/webapp/html/editor.html
+++ b/wise-editor/src/main/webapp/html/editor.html
@@ -57,6 +57,9 @@
                 <div id="discard" class="buttonOn" title="Discard">
                     <img src="../images/discard.png"/>
                 </div>
+                <div id="export" class="buttonOn" title="Export">
+                    <img src="../images/export.png"/>
+                </div>
             </div>
             <div id="edit" class="buttonContainer">
                 <div id="undoEdition" class="buttonOn" title="Undo Edition">
diff --git a/wise-editor/src/main/webapp/icons/legacy/printNews.png b/wise-editor/src/main/webapp/icons/legacy/printNews.png
deleted file mode 100644
index 7dd56f78..00000000
Binary files a/wise-editor/src/main/webapp/icons/legacy/printNews.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/icon_list.png b/wise-webapp/src/main/webapp/images/icon_list.png
new file mode 100644
index 00000000..ce13eaf6
Binary files /dev/null and b/wise-webapp/src/main/webapp/images/icon_list.png differ
diff --git a/wise-webapp/src/main/webapp/images/key.png b/wise-webapp/src/main/webapp/images/key.png
new file mode 100644
index 00000000..4ec1a928
Binary files /dev/null and b/wise-webapp/src/main/webapp/images/key.png differ