diff -r 0a4779c0e445 -r 6949fe7a69b6 src_js/iconolab-bundle/src/components/editor/Canvas.vue
--- a/src_js/iconolab-bundle/src/components/editor/Canvas.vue	Tue Mar 14 11:08:05 2017 +0100
+++ b/src_js/iconolab-bundle/src/components/editor/Canvas.vue	Tue Mar 14 12:50:50 2017 +0100
@@ -55,18 +55,21 @@
                 </defs>
             </svg>
         </div>
-        <div class="controls">
+        <div class="controls" v-show="loaded">
             <div class="controls-left">
-                <button @click="readonly = !readonly" type="button" class="btn">
-                    <i v-show="readonly" class="fa fa-pencil"></i>
-                    <i v-show="!readonly" class="fa fa-close"></i>
+                <button @click="toggleReadonly" type="button" class="btn"
+                    v-bind:class="{ 'disabled': !isAuthenticated }">
+                    <i v-show="readonly" class="fa fa-pencil"></i> <span v-show="readonly" class="small">Ajouter</span>
+                    <i v-show="!readonly" class="fa fa-close"></i> <span v-show="!readonly" class="small">Annuler</span>
                 </button>
                 <button @click="setMode('rect')" type="button" class="btn"
-                    v-bind:class="{ 'active': mode === 'rect', 'disabled': readonly }">
+                    v-bind:class="{ 'active': mode === 'rect', 'disabled': readonly }"
+                    v-show="!readonly">
                     <svg width="14" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve"><g><rect x="352" y="432" width="64" height="48"/><polygon points="416,352 416,96 176,96 176,160 352,160 352,352 160,352 160,32 96,32 96,96 32,96 32,160 96,160 96,416 480,416 480,352"/></g><text x="0" y="527" fill="#000000" font-size="5px" font-weight="bold" font-family="'Helvetica Neue', Helvetica, Arial-Unicode, Arial, Sans-serif">Created by Bluetip Design</text><text x="0" y="532" fill="#000000" font-size="5px" font-weight="bold" font-family="'Helvetica Neue', Helvetica, Arial-Unicode, Arial, Sans-serif">from the Noun Project</text></svg>
                 </button>
                 <button @click="setMode('free')" type="button" class="btn"
-                    v-bind:class="{ 'active': mode === 'free', 'disabled': readonly }">
+                    v-bind:class="{ 'active': mode === 'free', 'disabled': readonly }"
+                    v-show="!readonly">
                     <svg width="14" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="0 0 30 30" xml:space="preserve"><g transform="translate(-450 -380)"><g xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M453,395c0,2.209,1.79,4,4,4c1.307,0,2.455-0.635,3.186-1.604l7.121,4.069C467.11,401.938,467,402.456,467,403    c0,2.209,1.79,4,4,4c2.209,0,4-1.791,4-4s-1.791-4-4-4c-1.307,0-2.455,0.635-3.186,1.604l-7.121-4.069    c0.196-0.473,0.307-0.99,0.307-1.534s-0.11-1.062-0.307-1.534l7.121-4.069c0.73,0.969,1.879,1.604,3.186,1.604    c2.209,0,4-1.791,4-4s-1.791-4-4-4c-2.21,0-4,1.791-4,4c0,0.544,0.11,1.062,0.307,1.534l-7.121,4.069    c-0.73-0.969-1.879-1.604-3.186-1.604C454.79,391,453,392.791,453,395z M471,400c1.654,0,3,1.346,3,3s-1.346,3-3,3s-3-1.346-3-3    S469.346,400,471,400z M471,384c1.654,0,3,1.346,3,3s-1.346,3-3,3s-3-1.346-3-3S469.346,384,471,384z M460,395    c0,1.654-1.346,3-3,3s-3-1.346-3-3s1.346-3,3-3S460,393.346,460,395z"/></g></g><text x="0" y="45" fill="#000000" font-size="5px" font-weight="bold" font-family="'Helvetica Neue', Helvetica, Arial-Unicode, Arial, Sans-serif">Created by Hea Poh Lin</text><text x="0" y="50" fill="#000000" font-size="5px" font-weight="bold" font-family="'Helvetica Neue', Helvetica, Arial-Unicode, Arial, Sans-serif">from the Noun Project</text></svg>
                 </button>
             </div>
@@ -214,7 +217,9 @@
 
             },
             annotation: function(annotation) {
-                this.readonly = !!annotation || !this.isAuthenticated;
+                if (this.isAuthenticated) {
+                    this.readonly = !!annotation;
+                }
             },
             scale: function(scale) {
                 var factor = 0;
@@ -277,6 +282,10 @@
             onAnnotationClick: function(annotation) {
                 this.$emit('click:annotation', annotation);
             },
+            toggleReadonly: function() {
+                if (!this.isAuthenticated) { return; }
+                this.readonly = !this.readonly;
+            },
             hideTooltip: function() {
                 this.$refs.free.hideTooltip();
                 this.$refs.rect.hideTooltip();