Merge branch 'master' of git.sugarlabs.org:fototoon/mainline

15 files changed, 325 insertions, 480 deletions

diff --git a/MANIFEST b/MANIFEST
index eb1500e..0462ff2 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -9,14 +9,9 @@ locale/es/LC_MESSAGES/org.eq.FotoToon.mo
 locale/fr/activity.linfo
 locale/fr/LC_MESSAGES/org.eq.FotoToon.mo
 icons/add-box.svg
-icons/add-susurro.svg
 icons/add-photo.svg
-icons/add-grito.svg
-
-icons/add-nube.svg
 icons/turn.svg
 icons/add-globe.svg
-
 po/es.po
 po/POTFILES.in
 po/fr.po
@@ -313,3 +308,23 @@ po/da.po
 po/templates.po
 po/sl.po
 po/nl.po
+icons/add-think.svg
+icons/add-whisper.svg
+icons/add-scream.svg
+icons/save-as-image.svg
+icons/insert-picture.svg
+po/son.po
+po/ku.po
+po/tzm.po
+po/hus.po
+po/nah.po
+locale/tzm/activity.linfo
+locale/tzm/LC_MESSAGES/org.eq.FotoToon.mo
+locale/nah/activity.linfo
+locale/nah/LC_MESSAGES/org.eq.FotoToon.mo
+locale/son/activity.linfo
+locale/son/LC_MESSAGES/org.eq.FotoToon.mo
+locale/hus/activity.linfo
+locale/hus/LC_MESSAGES/org.eq.FotoToon.mo
+locale/ku/activity.linfo
+locale/ku/LC_MESSAGES/org.eq.FotoToon.mo
diff --git a/activity/activity.info b/activity/activity.info
index ceb492c..b3a4c5a 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -4,6 +4,6 @@ bundle_id = org.eq.FotoToon
 icon = historieta
 exec = sugar-activity historietaactivity.HistorietaActivity
 show_launcher = yes
-activity_version = 7
+activity_version = 9
 host_version = 2
 mime_types = application/x-fototoon-activity;
diff --git a/activity/historieta.svg b/activity/historieta.svg
index ff6fc5d..4b1ad79 100644
--- a/activity/historieta.svg
+++ b/activity/historieta.svg
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [

-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">

-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">

-	<!ENTITY stroke_color "#000000">
-	<!ENTITY fill_color "#AAAAAA">

-]>

+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+       <!ENTITY ns_svg "http://www.w3.org/2000/svg">
+       <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
+       <!ENTITY stroke_color "#000000">
+       <!ENTITY fill_color "#AAAAAA">
+]>
 
 <svg
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -17,7 +17,8 @@
   <defs
      id="defs2175" />
   <g
-     id="layer1">
+     id="layer1"
+     transform="matrix(0.82620172,0,0,0.84182981,4.2805137,3.2126069)">
     <path
        d="m 22.127176,13.501917 c -6.036427,0.344835 -4.687469,-2.881599 -5.879094,-2.45094 -20.5401977,2.781211 -17.5450694,-13.706509 4.21034,-7.9049136 7.016126,3.3371866 -0.336581,6.7071706 -0.336581,6.7071706 0,0 -0.326222,2.023059 2.005335,3.648683 z"
        id="path621"
@@ -27,7 +28,7 @@
        id="rect877"
        style="fill:&fill_color;;fill-opacity:1;stroke:&stroke_color;;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       d="m 17.142858,26.428572 a 5.5,5.8571429 0 1 1 -11.0000004,0 5.5,5.8571429 0 1 1 11.0000004,0 z"
+       d="m 17.142858,26.428572 a 5.5000002,5.8571431 0 1 1 -11.0000004,0 5.5000002,5.8571431 0 1 1 11.0000004,0 z"
        transform="translate(20.5,-10.571429)"
        id="path235"
        style="fill:&fill_color;;fill-opacity:1;stroke:&stroke_color;;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
diff --git a/historietaactivity.py b/historietaactivity.py
index 52b3411..6f0e5a5 100644
--- a/historietaactivity.py
+++ b/historietaactivity.py
@@ -73,14 +73,18 @@ class HistorietaActivity(activity.Activity):
 
         toolbar_box.show_all()
 
-        self._keep_palette = activity_button.page.keep.get_palette()
-
-        # hook up the export formats to the Keep button
-        for i, f in enumerate(self._EXPORT_FORMATS):
-            menu_item = MenuItem(f[1])
-            menu_item.connect('activate', self.write_image)
-            self._keep_palette.menu.append(menu_item)
-            menu_item.show()
+        # add export button
+
+        separator_2 = gtk.SeparatorToolItem()
+        separator_2.show()
+        activity_toolbar.insert(separator_2, -1)
+
+        self.bt_save_as_image = ToolButton()
+        self.bt_save_as_image.props.icon_name = 'save-as-image'
+        self.bt_save_as_image.connect('clicked', self.write_image)
+        self.bt_save_as_image.set_tooltip(_('Save as Image'))
+        activity_toolbar.insert(self.bt_save_as_image, -1)
+        self.bt_save_as_image.show()
 
         activity_button.page.title.connect("focus-in-event",
             self.on_title)
diff --git a/icons/add-box.svg b/icons/add-box.svg
index 9ce75ab..2e9c962 100644
--- a/icons/add-box.svg
+++ b/icons/add-box.svg
@@ -1,90 +1,29 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+  <!ENTITY fill_color "#FFFFFF">
+  <!ENTITY stroke_color "#010101">
+]>
 <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"
    version="1.0"
    width="55"
    height="55"
    viewBox="0 0 55 55"
    id="svg120"
-   xml:space="preserve"
-   sodipodi:version="0.32"
-   inkscape:version="0.46+devel"
-   sodipodi:docname="add-globe.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
-     id="metadata25"><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><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="950"
-     id="namedview23"
-     showgrid="false"
-     inkscape:zoom="8.9301795"
-     inkscape:cx="21.570155"
-     inkscape:cy="27.152882"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:current-layer="svg120" /><defs
-     id="defs133"><inkscape:perspective
-   sodipodi:type="inkscape:persp3d"
-   inkscape:vp_x="0 : 27.5 : 1"
-   inkscape:vp_y="0 : 1000 : 0"
-   inkscape:vp_z="55 : 27.5 : 1"
-   inkscape:persp3d-origin="27.5 : 18.333333 : 1"
-   id="perspective27" />
-	
-	<inkscape:perspective
-   id="perspective103"
-   inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-   inkscape:vp_z="1 : 0.5 : 1"
-   inkscape:vp_y="0 : 1000 : 0"
-   inkscape:vp_x="0 : 0.5 : 1"
-   sodipodi:type="inkscape:persp3d" /><inkscape:perspective
-   id="perspective1574"
-   inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-   inkscape:vp_z="1 : 0.5 : 1"
-   inkscape:vp_y="0 : 1000 : 0"
-   inkscape:vp_x="0 : 0.5 : 1"
-   sodipodi:type="inkscape:persp3d" /><inkscape:perspective
-   id="perspective1664"
-   inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-   inkscape:vp_z="1 : 0.5 : 1"
-   inkscape:vp_y="0 : 1000 : 0"
-   inkscape:vp_x="0 : 0.5 : 1"
-   sodipodi:type="inkscape:persp3d" /></defs>
-   
-   <!--rect
-     style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-     id="rect1644"
-     width="54.898254"
-     height="55.122215"
-     x="-0.014068492"
-     y="0.0038335328"
-     ry="3.8061128" / -->
-     <path
-     style="fill:none;stroke:#ffffff;stroke-width:2.55703568;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     d="m 10.239387,32.106685 c -0.213635,0 -0.399797,0.159301 -0.399797,0.372659 l 0,7.293453 -7.2763082,0 c -0.2136354,0 -0.3731441,0.159301 -0.3731441,0.372658 l 0,4.365425 c 0,0.213357 0.1595087,0.372659 0.3731441,0.372659 l 7.2763082,0 0,7.266834 c 0,0.213356 0.186162,0.399277 0.399797,0.399277 l 4.344464,0 c 0.213636,0 0.399797,-0.185921 0.399797,-0.399277 l 0,-7.266834 7.27631,0 c 0.213636,0 0.373144,-0.159302 0.373144,-0.372659 l 0,-4.365425 c 0,-0.213357 -0.159508,-0.372658 -0.373144,-0.372658 l -7.27631,0 0,-7.293453 c 0,-0.213358 -0.186161,-0.372659 -0.399797,-0.372659 l -4.344464,0 z"
-     id="rect1054" />
-     <rect
-     style="fill:#none;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-     id="rect1700"
-     width="37.177303"
-     height="21.948048"
-     x="14.109459"
-     y="5.2809548"
-     ry="0.22275767" /></svg>
+   xml:space="preserve">
+   <rect
+   width="37.177303"
+   height="21.948048"
+   ry="0.22275767"
+   x="14.109459"
+   y="5.2809548"
+   id="rect1700"
+   style="fill-opacity:1;stroke:&fill_color;;fill:none;stroke-width:2;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /><g
+   transform="translate(25.519287,11.066432)"
+   id="g3759"><path
+     d="m -13.107667,23.926346 0,14.670779"
+     id="path2987"
+     style="fill:none;stroke:&fill_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+     d="m -20.443057,31.261735 14.670779,0"
+     id="path3757"
+     style="fill:none;stroke:&fill_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></svg>
diff --git a/icons/add-globe.svg b/icons/add-globe.svg
index 648dc3d..137925e 100644
--- a/icons/add-globe.svg
+++ b/icons/add-globe.svg
@@ -1,86 +1,26 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+  <!ENTITY fill_color "#FFFFFF">
+  <!ENTITY stroke_color "#010101">
+]>
 <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"
    version="1.0"
    width="55"
    height="55"
    viewBox="0 0 55 55"
    id="svg120"
-   xml:space="preserve"
-   sodipodi:version="0.32"
-   inkscape:version="0.46+devel"
-   sodipodi:docname="add-globe.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
-     id="metadata25"><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 /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="950"
-     id="namedview23"
-     showgrid="false"
-     inkscape:zoom="8.9301795"
-     inkscape:cx="18.628881"
-     inkscape:cy="27.152882"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:current-layer="svg120" /><defs
-     id="defs133"><inkscape:perspective
-   sodipodi:type="inkscape:persp3d"
-   inkscape:vp_x="0 : 27.5 : 1"
-   inkscape:vp_y="0 : 1000 : 0"
-   inkscape:vp_z="55 : 27.5 : 1"
-   inkscape:persp3d-origin="27.5 : 18.333333 : 1"
-   id="perspective27" />
-	
-	<inkscape:perspective
-   id="perspective103"
-   inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-   inkscape:vp_z="1 : 0.5 : 1"
-   inkscape:vp_y="0 : 1000 : 0"
-   inkscape:vp_x="0 : 0.5 : 1"
-   sodipodi:type="inkscape:persp3d" /><inkscape:perspective
-   id="perspective1574"
-   inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-   inkscape:vp_z="1 : 0.5 : 1"
-   inkscape:vp_y="0 : 1000 : 0"
-   inkscape:vp_x="0 : 0.5 : 1"
-   sodipodi:type="inkscape:persp3d" /><inkscape:perspective
-   id="perspective1664"
-   inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-   inkscape:vp_z="1 : 0.5 : 1"
-   inkscape:vp_y="0 : 1000 : 0"
-   inkscape:vp_x="0 : 0.5 : 1"
-   sodipodi:type="inkscape:persp3d" /></defs><!--rect
-     style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-     id="rect1644"
-     width="54.898254"
-     height="55.122215"
-     x="-0.014068492"
-     y="0.0038335328"
-     ry="3.8061128" /-->
-     <!-- globo -->
-     <path
-     style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.86975145;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     d="m 31.447785,2.0457409 c -11.843026,0 -21.440125,6.7597343 -21.440125,15.0850351 0,8.325301 9.597099,15.057807 21.440125,15.057807 0.914185,0 1.811611,-0.03087 2.695688,-0.108917 2.643928,4.512539 7.805427,7.593994 13.760548,7.760352 -2.925897,-2.504111 -5.139787,-5.740724 -6.300388,-9.42134 6.719651,-2.545253 11.284277,-7.545962 11.284277,-13.287902 0,-8.3253008 -9.597099,-15.0850351 -21.440125,-15.0850351 z"
-     id="path1046" />
-     <!-- mas -->
-     <path
-     style="fill:none;stroke:#ffffff;stroke-width:2.55703568;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     d="m 10.239387,32.106685 c -0.213635,0 -0.399797,0.159301 -0.399797,0.372659 l 0,7.293453 -7.2763082,0 c -0.2136354,0 -0.3731441,0.159301 -0.3731441,0.372658 l 0,4.365425 c 0,0.213357 0.1595087,0.372659 0.3731441,0.372659 l 7.2763082,0 0,7.266834 c 0,0.213356 0.186162,0.399277 0.399797,0.399277 l 4.344464,0 c 0.213636,0 0.399797,-0.185921 0.399797,-0.399277 l 0,-7.266834 7.27631,0 c 0.213636,0 0.373144,-0.159302 0.373144,-0.372659 l 0,-4.365425 c 0,-0.213357 -0.159508,-0.372658 -0.373144,-0.372658 l -7.27631,0 0,-7.293453 c 0,-0.213358 -0.186161,-0.372659 -0.399797,-0.372659 l -4.344464,0 z"
-     id="rect1054" /></svg>
+   xml:space="preserve"><path
+   d="m 31.447785,2.0457409 c -11.843026,0 -21.440125,6.7597343 -21.440125,15.0850351 0,8.325301 9.597099,15.057807 21.440125,15.057807 0.914185,0 1.811611,-0.03087 2.695688,-0.108917 2.643928,4.512539 7.805427,7.593994 13.760548,7.760352 -2.925897,-2.504111 -5.139787,-5.740724 -6.300388,-9.42134 6.719651,-2.545253 11.284277,-7.545962 11.284277,-13.287902 0,-8.3253008 -9.597099,-15.0850351 -21.440125,-15.0850351 z"
+   id="path1046"
+   style="fill:none;stroke:&fill_color;;stroke-width:1.86975145;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+     
+     <g
+   transform="translate(25.519287,11.066432)"
+   id="g3759"><path
+     d="m -13.107667,23.926346 0,14.670779"
+     id="path2987"
+     style="fill:none;stroke:&fill_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+     d="m -20.443057,31.261735 14.670779,0"
+     id="path3757"
+     style="fill:none;stroke:&fill_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></svg>
\ No newline at end of file
diff --git a/icons/add-grito.svg b/icons/add-grito.svg
deleted file mode 100644
index 832e3f1..0000000
--- a/icons/add-grito.svg
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-
-<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"
-   version="1.0"
-   width="55"
-   height="55"
-   viewBox="0 0 55 55"
-   id="svg120"
-   xml:space="preserve"
-   sodipodi:version="0.32"
-   inkscape:version="0.46+devel"
-   sodipodi:docname="add-box.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
-     id="metadata25"><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><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="950"
-     id="namedview23"
-     showgrid="false"
-     inkscape:zoom="8.9301795"
-     inkscape:cx="21.570155"
-     inkscape:cy="27.152882"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:current-layer="svg120" /><defs
-     id="defs133"><inkscape:perspective
-   sodipodi:type="inkscape:persp3d"
-   inkscape:vp_x="0 : 27.5 : 1"
-   inkscape:vp_y="0 : 1000 : 0"
-   inkscape:vp_z="55 : 27.5 : 1"
-   inkscape:persp3d-origin="27.5 : 18.333333 : 1"
-   id="perspective27" />
-	
-	<inkscape:perspective
-   id="perspective103"
-   inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-   inkscape:vp_z="1 : 0.5 : 1"
-   inkscape:vp_y="0 : 1000 : 0"
-   inkscape:vp_x="0 : 0.5 : 1"
-   sodipodi:type="inkscape:persp3d" /><inkscape:perspective
-   id="perspective1574"
-   inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-   inkscape:vp_z="1 : 0.5 : 1"
-   inkscape:vp_y="0 : 1000 : 0"
-   inkscape:vp_x="0 : 0.5 : 1"
-   sodipodi:type="inkscape:persp3d" /><inkscape:perspective
-   id="perspective1664"
-   inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-   inkscape:vp_z="1 : 0.5 : 1"
-   inkscape:vp_y="0 : 1000 : 0"
-   inkscape:vp_x="0 : 0.5 : 1"
-   sodipodi:type="inkscape:persp3d" /></defs>
-   
-   
-   <!--rect
-     style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-     id="rect1644"
-     width="54.898254"
-     height="55.122215"
-     x="-0.014068492"
-     y="0.0038335328"
-     ry="3.8061128" / -->
-     
-   <path
-     style="fill:none;stroke:#ffffff;stroke-width:2.55703568;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     d="m 10.239387,32.106685 c -0.213635,0 -0.399797,0.159301 -0.399797,0.372659 l 0,7.293453 -7.2763082,0 c -0.2136354,0 -0.3731441,0.159301 -0.3731441,0.372658 l 0,4.365425 c 0,0.213357 0.1595087,0.372659 0.3731441,0.372659 l 7.2763082,0 0,7.266834 c 0,0.213356 0.186162,0.399277 0.399797,0.399277 l 4.344464,0 c 0.213636,0 0.399797,-0.185921 0.399797,-0.399277 l 0,-7.266834 7.27631,0 c 0.213636,0 0.373144,-0.159302 0.373144,-0.372659 l 0,-4.365425 c 0,-0.213357 -0.159508,-0.372658 -0.373144,-0.372658 l -7.27631,0 0,-7.293453 c 0,-0.213358 -0.186161,-0.372659 -0.399797,-0.372659 l -4.344464,0 z"
-     id="rect1054" />
-   <path
-     sodipodi:type="star"
-     style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.20351303;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-     id="path2233"
-     sodipodi:sides="10"
-     sodipodi:cx="28.890797"
-     sodipodi:cy="11.887765"
-     sodipodi:r1="9.2679806"
-     sodipodi:r2="5.3444834"
-     sodipodi:arg1="0.49066806"
-     sodipodi:arg2="0.78731865"
-     inkscape:flatsided="false"
-     inkscape:rounded="0"
-     inkscape:randomized="0"
-     d="m 37.065325,16.254979 -4.402673,-0.580843 0.274493,4.551646 -3.220426,-3.057737 -2.453321,3.843701 -0.808087,-4.36668 -4.244049,1.667594 1.912914,-4.0077 -4.413695,-1.145478 3.903247,-2.117915 -2.897459,-3.5210157 4.402672,0.5808424 -0.274493,-4.5516459 3.220426,3.0577373 2.453322,-3.8437016 0.808086,4.3666804 4.24405,-1.6675939 -1.912915,4.0077 4.413696,1.145478 -3.903248,2.117914 2.89746,3.521017 z"
-     transform="matrix(2.1310856,0.68276117,-0.43538922,1.4614936,-27.095557,-18.921051)" /></svg>
diff --git a/icons/add-nube.svg b/icons/add-nube.svg
deleted file mode 100644
index 027a79d..0000000
--- a/icons/add-nube.svg
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-
-<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"
-   version="1.0"
-   width="55"
-   height="55"
-   viewBox="0 0 55 55"
-   id="svg120"
-   xml:space="preserve"
-   sodipodi:version="0.32"
-   inkscape:version="0.46+devel"
-   sodipodi:docname="add-grito.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
-     id="metadata25"><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><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="950"
-     id="namedview23"
-     showgrid="false"
-     inkscape:zoom="8.9301795"
-     inkscape:cx="21.570155"
-     inkscape:cy="27.152882"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:current-layer="svg120" /><defs
-     id="defs133"><inkscape:perspective
-   sodipodi:type="inkscape:persp3d"
-   inkscape:vp_x="0 : 27.5 : 1"
-   inkscape:vp_y="0 : 1000 : 0"
-   inkscape:vp_z="55 : 27.5 : 1"
-   inkscape:persp3d-origin="27.5 : 18.333333 : 1"
-   id="perspective27" />
-	
-	<inkscape:perspective
-   id="perspective103"
-   inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-   inkscape:vp_z="1 : 0.5 : 1"
-   inkscape:vp_y="0 : 1000 : 0"
-   inkscape:vp_x="0 : 0.5 : 1"
-   sodipodi:type="inkscape:persp3d" /><inkscape:perspective
-   id="perspective1574"
-   inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-   inkscape:vp_z="1 : 0.5 : 1"
-   inkscape:vp_y="0 : 1000 : 0"
-   inkscape:vp_x="0 : 0.5 : 1"
-   sodipodi:type="inkscape:persp3d" /><inkscape:perspective
-   id="perspective1664"
-   inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-   inkscape:vp_z="1 : 0.5 : 1"
-   inkscape:vp_y="0 : 1000 : 0"
-   inkscape:vp_x="0 : 0.5 : 1"
-   sodipodi:type="inkscape:persp3d" /></defs>
-   
-   <!--rect
-     style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-     id="rect1644"
-     width="54.898254"
-     height="55.122215"
-     x="-0.014068492"
-     y="0.0038335328"
-     ry="3.8061128" /-->
-     <path
-     style="fill:none;stroke:#ffffff;stroke-width:2.55703568;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     d="m 10.239387,32.106685 c -0.213635,0 -0.399797,0.159301 -0.399797,0.372659 l 0,7.293453 -7.2763082,0 c -0.2136354,0 -0.3731441,0.159301 -0.3731441,0.372658 l 0,4.365425 c 0,0.213357 0.1595087,0.372659 0.3731441,0.372659 l 7.2763082,0 0,7.266834 c 0,0.213356 0.186162,0.399277 0.399797,0.399277 l 4.344464,0 c 0.213636,0 0.399797,-0.185921 0.399797,-0.399277 l 0,-7.266834 7.27631,0 c 0.213636,0 0.373144,-0.159302 0.373144,-0.372659 l 0,-4.365425 c 0,-0.213357 -0.159508,-0.372658 -0.373144,-0.372658 l -7.27631,0 0,-7.293453 c 0,-0.213358 -0.186161,-0.372659 -0.399797,-0.372659 l -4.344464,0 z"
-     id="rect1054" /><path
-     style="fill:none;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     d="M 23.000126,9.369486 C 22.601191,5.2851303 28.752807,2.9886181 30.978565,6.4692237 34.531726,1.9494402 41.73917,4.7772248 41.111962,8.1293555 c 4.458671,-1.979128 9.878914,1.576469 6.77748,5.6074755 4.02251,2.427307 2.246797,9.461405 -2.690259,8.330588 3.052946,4.040533 -2.741033,7.32616 -6.560933,4.97001 -2.403816,2.83175 -11.040537,2.323845 -11.703075,-1.871169 -6.095094,2.788388 -12.397578,-0.820311 -8.12127,-7.079522 -8.074218,-5.2143 -0.336213,-10.9372163 4.186221,-8.717252 z"
-     id="path2256"
-     sodipodi:nodetypes="ccccccccc" /><path
-     sodipodi:type="arc"
-     style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-     id="path2263"
-     sodipodi:cx="31.858263"
-     sodipodi:cy="33.331902"
-     sodipodi:rx="1.8476672"
-     sodipodi:ry="1.6237075"
-     d="m 33.70593,33.331902 a 1.8476672,1.6237075 0 1 1 -3.695334,0 1.8476672,1.6237075 0 1 1 3.695334,0 z"
-     transform="matrix(1.0959906,0,0,1.1092307,1.5890678,-3.3609184)" />
-     <path
-     sodipodi:type="arc"
-     style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-     id="path2265"
-     sodipodi:cx="37.345272"
-     sodipodi:cy="37.979065"
-     sodipodi:rx="1.3997478"
-     sodipodi:ry="1.4557378"
-     d="m 38.74502,37.979065 a 1.3997478,1.4557378 0 1 1 -2.799496,0 1.3997478,1.4557378 0 1 1 2.799496,0 z"
-     transform="translate(5.4870118,1.9036571)" /></svg>
diff --git a/icons/add-scream.svg b/icons/add-scream.svg
new file mode 100644
index 0000000..3a7404e
--- /dev/null
+++ b/icons/add-scream.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+  <!ENTITY fill_color "#FFFFFF">
+  <!ENTITY stroke_color "#010101">
+]>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="55"
+   height="55"
+   viewBox="0 0 55 55"
+   id="svg120"
+   xml:space="preserve"><path
+   d="m 37.065325,16.254979 -4.402673,-0.580843 0.274493,4.551646 -3.220426,-3.057737 -2.453321,3.843701 -0.808087,-4.36668 -4.244049,1.667594 1.912914,-4.0077 -4.413695,-1.145478 3.903247,-2.117915 -2.897459,-3.5210157 4.402672,0.5808424 -0.274493,-4.5516459 3.220426,3.0577373 2.453322,-3.8437016 0.808086,4.3666804 4.24405,-1.6675939 -1.912915,4.0077 4.413696,1.145478 -3.903248,2.117914 z"
+   transform="matrix(2.2288567,-0.19971595,0.16722614,1.5157713,-38.203792,5.0333362)"
+   id="path2233"
+   style="fill:none;stroke:&fill_color;;stroke-width:1.20351303;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /><g
+   transform="translate(25.519287,11.066432)"
+   id="g3759"><path
+     d="m -13.107667,23.926346 0,14.670779"
+     id="path2987"
+     style="fill:none;stroke:&fill_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+     d="m -20.443057,31.261735 14.670779,0"
+     id="path3757"
+     style="fill:none;stroke:&fill_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></svg>
\ No newline at end of file
diff --git a/icons/add-susurro.svg b/icons/add-susurro.svg
deleted file mode 100644
index ce90857..0000000
--- a/icons/add-susurro.svg
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-
-<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"
-   version="1.0"
-   width="55"
-   height="55"
-   viewBox="0 0 55 55"
-   id="svg120"
-   xml:space="preserve"
-   sodipodi:version="0.32"
-   inkscape:version="0.46+devel"
-   sodipodi:docname="add-susurro.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
-     id="metadata25"><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><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="950"
-     id="namedview23"
-     showgrid="false"
-     inkscape:zoom="8.9301795"
-     inkscape:cx="18.628881"
-     inkscape:cy="27.152882"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:current-layer="svg120" /><defs
-     id="defs133"><inkscape:perspective
-   sodipodi:type="inkscape:persp3d"
-   inkscape:vp_x="0 : 27.5 : 1"
-   inkscape:vp_y="0 : 1000 : 0"
-   inkscape:vp_z="55 : 27.5 : 1"
-   inkscape:persp3d-origin="27.5 : 18.333333 : 1"
-   id="perspective27" />
-	
-	<inkscape:perspective
-   id="perspective103"
-   inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-   inkscape:vp_z="1 : 0.5 : 1"
-   inkscape:vp_y="0 : 1000 : 0"
-   inkscape:vp_x="0 : 0.5 : 1"
-   sodipodi:type="inkscape:persp3d" /><inkscape:perspective
-   id="perspective1574"
-   inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-   inkscape:vp_z="1 : 0.5 : 1"
-   inkscape:vp_y="0 : 1000 : 0"
-   inkscape:vp_x="0 : 0.5 : 1"
-   sodipodi:type="inkscape:persp3d" /><inkscape:perspective
-   id="perspective1686"
-   inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-   inkscape:vp_z="1 : 0.5 : 1"
-   inkscape:vp_y="0 : 1000 : 0"
-   inkscape:vp_x="0 : 0.5 : 1"
-   sodipodi:type="inkscape:persp3d" /></defs>
-<!--rect
-     style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"
-     id="rect1644"
-     width="54.898254"
-     height="55.122215"
-     x="0.20989008"
-     y="0.11581264"
-     ry="3.8061128" / -->
-<path
-     style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.86975145;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1.86975145, 3.73950291;stroke-dashoffset:0"
-     d="m 31.559765,2.1577207 c -11.843026,0 -21.440125,6.7597343 -21.440125,15.0850343 0,8.325301 9.597099,15.057807 21.440125,15.057807 0.914185,0 1.811611,-0.03087 2.695688,-0.108917 2.643928,4.512539 7.805427,7.593994 13.760548,7.760352 -2.925897,-2.504111 -5.139787,-5.740724 -6.300388,-9.42134 6.719651,-2.545253 11.284277,-7.545962 11.284277,-13.287902 0,-8.3253 -9.597099,-15.0850343 -21.440125,-15.0850343 z"
-     id="path1046" /><path
-     style="fill:none;stroke:#ffffff;stroke-width:2.55703568;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     d="m 10.369508,32.460736 c -0.213635,0 -0.3997968,0.159301 -0.3997968,0.372659 l 0,7.293453 -7.276308,0 c -0.213635,0 -0.373144,0.159301 -0.373144,0.372658 l 0,4.365425 c 0,0.213357 0.159509,0.372659 0.373144,0.372659 l 7.276308,0 0,7.266834 c 0,0.213356 0.1861618,0.399277 0.3997968,0.399277 l 4.344464,0 c 0.213636,0 0.399797,-0.185921 0.399797,-0.399277 l 0,-7.266834 7.27631,0 c 0.213636,0 0.373144,-0.159302 0.373144,-0.372659 l 0,-4.365425 c 0,-0.213357 -0.159508,-0.372658 -0.373144,-0.372658 l -7.27631,0 0,-7.293453 c 0,-0.213358 -0.186161,-0.372659 -0.399797,-0.372659 l -4.344464,0 z"
-     id="rect1054-1" /></svg>
diff --git a/icons/add-think.svg b/icons/add-think.svg
new file mode 100644
index 0000000..e396b63
--- /dev/null
+++ b/icons/add-think.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+  <!ENTITY fill_color "#FFFFFF">
+  <!ENTITY stroke_color "#010101">
+]>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="55"
+   height="55"
+   viewBox="0 0 55 55"
+   id="svg120"
+   xml:space="preserve"><path
+   d="M 23.000126,9.369486 C 22.601191,5.2851303 28.752807,2.9886181 30.978565,6.4692237 34.531726,1.9494402 41.73917,4.7772248 41.111962,8.1293555 c 4.458671,-1.979128 9.878914,1.576469 6.77748,5.6074755 4.02251,2.427307 2.246797,9.461405 -2.690259,8.330588 3.052946,4.040533 -2.741033,7.32616 -6.560933,4.97001 -2.403816,2.83175 -11.040537,2.323845 -11.703075,-1.871169 -6.095094,2.788388 -12.397578,-0.820311 -8.12127,-7.079522 -8.074218,-5.2143 -0.336213,-10.9372163 4.186221,-8.717252 z"
+   id="path2256"
+   style="fill:none;stroke:&fill_color;;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+   d="m 33.70593,33.331902 a 1.8476672,1.6237075 0 1 1 -3.695334,0 1.8476672,1.6237075 0 1 1 3.695334,0 z"
+   transform="matrix(1.0959906,0,0,1.1092307,1.5890678,-3.3609184)"
+   id="path2263"
+   style="fill:none;stroke:&fill_color;;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+     <path
+   d="m 38.74502,37.979065 a 1.3997478,1.4557378 0 1 1 -2.799496,0 1.3997478,1.4557378 0 1 1 2.799496,0 z"
+   transform="translate(5.4870118,1.9036571)"
+   id="path2265"
+   style="fill:none;stroke:&fill_color;;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /><g
+   transform="translate(25.519287,11.066432)"
+   id="g3759"><path
+     d="m -13.107667,23.926346 0,14.670779"
+     id="path2987"
+     style="fill:none;stroke:&fill_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+     d="m -20.443057,31.261735 14.670779,0"
+     id="path3757"
+     style="fill:none;stroke:&fill_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></svg>
\ No newline at end of file
diff --git a/icons/add-whisper.svg b/icons/add-whisper.svg
new file mode 100644
index 0000000..dce307e
--- /dev/null
+++ b/icons/add-whisper.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+  <!ENTITY fill_color "#FFFFFF">
+  <!ENTITY stroke_color "#010101">
+]>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="55"
+   height="55"
+   viewBox="0 0 55 55"
+   id="svg120"
+   xml:space="preserve"><path
+   d="m 31.559765,2.1577207 c -11.843026,0 -21.440125,6.7597343 -21.440125,15.0850343 0,8.325301 9.597099,15.057807 21.440125,15.057807 0.914185,0 1.811611,-0.03087 2.695688,-0.108917 2.643928,4.512539 7.805427,7.593994 13.760548,7.760352 -2.925897,-2.504111 -5.139787,-5.740724 -6.300388,-9.42134 6.719651,-2.545253 11.284277,-7.545962 11.284277,-13.287902 0,-8.3253 -9.597099,-15.0850343 -21.440125,-15.0850343 z"
+   id="path1046"
+   style="fill:none;stroke:&fill_color;;stroke-width:1.86975145;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1.86975145, 3.73950291;stroke-dashoffset:0" /><g
+   transform="translate(25.649409,11.420483)"
+   id="g3759"><path
+     d="m -13.107667,23.926346 0,14.670779"
+     id="path2987"
+     style="fill:none;stroke:&fill_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+     d="m -20.443057,31.261735 14.670779,0"
+     id="path3757"
+     style="fill:none;stroke:&fill_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></svg>
\ No newline at end of file
diff --git a/icons/insert-picture.svg b/icons/insert-picture.svg
new file mode 100644
index 0000000..b8d4cf4
--- /dev/null
+++ b/icons/insert-picture.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+  <!ENTITY fill_color "#FFFFFF">
+  <!ENTITY stroke_color "#010101">
+]>
+<svg xmlns="http://www.w3.org/2000/svg" width="55" height="55" id="insert-image.svg">
+  <defs>
+    <mask id="Mask" maskUnits="userSpaceOnUse" x="0" y="0" width="55" height="55">
+      <rect x="0" y="0" width="55" height="55" fill="white" />
+      <line x1="35" y1="4" x2="35" y2="26" stroke-width="10.0" stroke="black" />
+      <line x1="24" y1="15" x2="46" y2="15" stroke-width="10.0" stroke="black" />
+      <polyline points="17.7,38.7 26.3,31 21,38.7" style="fill:black;;stroke:none;;stroke-width:0" />
+    </mask>
+  </defs>
+  <g transform="translate(2,2)">
+      <rect
+         style="opacity:1;fill:#000000;fill-opacity:0;stroke:#ffffff;stroke-width:2.89933752999999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect3161"
+         width="37.150295"
+         height="28.059385"
+         x="7.0200901"
+         y="12.647797" />
+      <polyline
+         points="13,39.7 27.6,29.6 34.3,33.6 34.3,39.7"
+         mask="url(#Mask)"
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:3;stroke-opacity:1"
+         id="polyline23"
+         transform="matrix(0.9827085,0,0,0.9742491,10.040979,0.9463818)" />
+      <polyline
+         points="5,35 13.7,32.3 20.3,34.1"
+         mask="url(#Mask)"
+         style="fill:none;stroke:#ffffff;stroke-width:2.50000000000000000;stroke-opacity:1"
+         id="polyline21"
+         transform="translate(3.3549781,4.1125541)" />
+  </g>
+  <line fill="none" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="7" x1="28.376" x2="28.376" y1="30.664" y2="5.712"/>
+  <polyline fill="none" points="36.098,21.51 28.376,30.664 20.653,21.51" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="7"/>
+  <line fill="none" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5" x1="28.376" x2="28.376" y1="30.664" y2="5.712"/>
+  <polyline fill="none" points="36.098,21.51 28.376,30.664 20.653,21.51" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5"/>
+</svg>
diff --git a/icons/save-as-image.svg b/icons/save-as-image.svg
new file mode 100644
index 0000000..365f578
--- /dev/null
+++ b/icons/save-as-image.svg
@@ -0,0 +1,116 @@
+<?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"
+   version="1.1"
+   width="55"
+   height="55"
+   viewBox="0 0 55 55"
+   id="svg2"
+   xml:space="preserve"><metadata
+     id="metadata25"><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><defs
+     id="defs33">
+	
+	
+	
+
+  
+  
+
+  
+   
+   
+   
+   
+
+	
+
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	</defs><g
+     transform="matrix(0.55205508,0,0,0.55205508,77.118464,18.235971)"
+     id="g4382"><g
+       transform="translate(-80.093659,12.220029)"
+       id="g4308"
+       style="fill:none;stroke:#ffffff;stroke-opacity:1">
+			<g
+   id="g4310"
+   style="fill:none;stroke:#ffffff;stroke-opacity:1">
+				<path
+   d="m 6.736,49.002 h 24.52 c 2.225,0 3.439,-1.447 3.439,-3.441 v -27.28 c 0,-1.73 -1.732,-3.441 -3.439,-3.441 h -4.389"
+   id="path4312"
+   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+			</g>
+		</g><g
+       transform="translate(-80.093659,12.220029)"
+       id="g4314"
+       style="fill:none;stroke:#ffffff;stroke-opacity:1">
+			<g
+   id="g4316"
+   style="fill:none;stroke:#ffffff;stroke-opacity:1">
+				<path
+   d="m 26.867,38.592 c 0,1.836 -1.345,3.201 -3.441,4.047 L 6.736,49.002 V 14.84 l 16.69,-8.599 c 2.228,-0.394 3.441,0.84 3.441,2.834 v 29.517 z"
+   id="path4318"
+   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+			</g>
+		</g><path
+       d="m -70.669659,54.827029 c 0,0 -1.351,-0.543 -2.702,-0.543 -1.351,0 -2.703,0.543 -2.703,0.543"
+       id="path4320"
+       style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+       d="m -70.669659,44.226029 c 0,0 -1.239,-0.543 -2.815,-0.543 -1.577,0 -2.59,0.543 -2.59,0.543"
+       id="path4322"
+       style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+       d="m -70.669659,33.898029 c 0,0 -1.125,-0.544 -2.927,-0.544 -1.802,0 -2.478,0.544 -2.478,0.544"
+       id="path4324"
+       style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><line
+       style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       x1="-66.884659"
+       x2="-66.884659"
+       y1="58.753029"
+       y2="23.725029"
+       id="line4326" /></g><g
+     transform="matrix(1.1623273,0,0,1.1623273,-14.422024,-12.63995)"
+     id="g3882"
+     style="fill:none;stroke:#ffffff;stroke-width:2.15085721;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"><g
+       id="g3884"
+       style="fill:none;stroke:#ffffff;stroke-width:2.15085721;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"><polygon
+         points="43.041,21.577 35.281,13.812 15.204,13.812 15.204,35.189 43.041,35.189 "
+         id="polygon3886"
+         style="fill:none;stroke:#ffffff;stroke-width:2.15085721;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><polyline
+         id="polyline3888"
+         points="35.281,13.812 35.281,21.577 43.041,21.577    "
+         style="fill:none;stroke:#ffffff;stroke-width:2.15085721;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></g><path
+     d="m 19.426691,12.275117 c -4.727185,0 -8.666312,4.714399 -8.666312,4.714399 0,0 3.939127,4.737646 8.666312,4.735322 4.729509,-0.0046 8.668637,-4.739971 8.668637,-4.739971 0,0 -3.939128,-4.713237 -8.668637,-4.70975 z m 0,8.039818 c -1.830666,0 -3.314958,-1.484292 -3.314958,-3.31612 0,-1.827179 1.484292,-3.314958 3.314958,-3.314958 1.828341,0 3.312632,1.487779 3.312632,3.314958 0,1.831828 -1.484291,3.31612 -3.312632,3.31612 z"
+     id="path3890"
+     style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline" /><circle
+     cx="29.207001"
+     cy="25.863001"
+     r="1.294"
+     transform="matrix(1.1623273,0,0,1.1623273,-14.520241,-13.061294)"
+     id="circle3892"
+     style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline" /><g
+     transform="matrix(1,0,0,-1,-24.850339,47.707501)"
+     id="g4770"><g
+       transform="translate(34.0803,-1006.42)"
+       id="g4772"><polyline
+         transform="matrix(-0.469241,0.469241,-0.469241,-0.469241,66.2906,1019.03)"
+         style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round"
+         points="51.562,15.306 41.17,16.188 42.053,5.794"
+         id="polyline4774" /><path
+         d="m 39.363241,1033.1291 -0.05636,9.9115 -8.750608,0.067"
+         id="path4776"
+         style="fill:none;stroke:#ffffff;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></g></svg>
\ No newline at end of file
diff --git a/toolbar.py b/toolbar.py
index 0eea68b..55a8168 100644
--- a/toolbar.py
+++ b/toolbar.py
@@ -77,7 +77,7 @@ class GlobesManager():
 
         # agregar cuadro
         self.add_photo = ToolButton()
-        self.add_photo.props.icon_name = 'add-photo'
+        self.add_photo.props.icon_name = 'insert-picture'
         self.add_photo.connect('clicked', self.__btn_clicked)
         self.add_photo.set_tooltip(_('Add Photo'))
         toolbar.insert(self.add_photo, -1)
@@ -95,21 +95,21 @@ class GlobesManager():
 
         #agrega nube
         self.add_cloud = ToolButton()
-        self.add_cloud.props.icon_name = 'add-nube'
+        self.add_cloud.props.icon_name = 'add-think'
         self.add_cloud.connect('clicked', self.__btn_clicked)
         self.add_cloud.set_tooltip(_('Add Think'))
         toolbar.insert(self.add_cloud, -1)
 
         # agrega susurro
         self.add_whisp = ToolButton()
-        self.add_whisp.props.icon_name = 'add-susurro'
+        self.add_whisp.props.icon_name = 'add-whisper'
         self.add_whisp.connect('clicked', self.__btn_clicked)
         self.add_whisp.set_tooltip(_('Add Whisper'))
         toolbar.insert(self.add_whisp, -1)
 
         # agrega grito
         self.add_scream = ToolButton()
-        self.add_scream.props.icon_name = 'add-grito'
+        self.add_scream.props.icon_name = 'add-scream'
         self.add_scream.connect('clicked', self.__btn_clicked)
         self.add_scream.set_tooltip(_('Add Exclamation'))
         toolbar.insert(self.add_scream, -1)
@@ -322,9 +322,6 @@ class TextToolbar(gtk.Toolbar):
         tool_item = ToolComboBox(self._font_combo)
         self.insert(tool_item, -1)
 
-        separator = gtk.SeparatorToolItem()
-        separator.set_draw(True)
-        self.insert(separator, -1)
         self.show_all()
 
     def get_text_selected_handler(self):