diff --git a/aplicmap/legenda9.htm b/aplicmap/legenda9.htm
index 2aa964a..dd095f3 100755
--- a/aplicmap/legenda9.htm
+++ b/aplicmap/legenda9.htm
@@ -7,7 +7,7 @@
 			<tr><td style=text-align:left >
 			<img style='position:relative;top:3px;' class='i3GEOLegendaExcluiTema' onclick='i3GEO.mapa.legendaHTML.escondeTema("[leg_layer_name]")' title="Esconde" src="../imagens/oxygen/16x16/edit-delete.png" >
 			<b><span class=legendaTema ><input value="[leg_layer_name]" name="layer" onclick="i3GEO.mapa.legendaHTML.ativaDesativaTema(this)" type=checkbox checked class=inputsb style=opacity:0.3;cursor:pointer;position:relative;top:2px;left:2px; >
-			<label style='cursor:pointer;' onmouseout='this.childNodes[1].style.display="none";' onmouseover='this.childNodes[1].style.display="block";' onclick='i3GEO.tema.dialogo.mudanome("[leg_layer_name]")'>&nbsp;&nbsp;[metadata name=TEMA]
+			<label style='cursor:pointer;' onmouseout='this.getElementsByTagName("div")[0].style.display="none";' onmouseover='this.getElementsByTagName("div")[0].style.display="block";' onclick='i3GEO.tema.dialogo.mudanome("[leg_layer_name]")'>&nbsp;&nbsp;[metadata name=TEMA]
 			<div class='i3GEOiconeEditar' style='display:none;float:right;top:5px;' ></div>
 			</label>
 			</span></b><br>  </td>
@@ -30,6 +30,7 @@
 					<td style=width:20px;text-align:left; ><input type=checkbox CHECKED title=liga/desliga class=inputsb style='border: 0px solid red;cursor:pointer;opacity:0.3;' value=[leg_class_index] name=[leg_layer_name] id='legendack_[leg_layer_name]_[leg_class_index]' onclick='i3GEO.arvoreDeCamadas.inverteStatusClasse(this)' />
 					</td>
 					<td style=text-align:left >
+						<span style='cursor:pointer;' onmouseout='this.getElementsByTagName("div")[0].style.display="none";' onmouseover='this.getElementsByTagName("div")[0].style.display="block";' onclick='i3GEO.tema.dialogo.editaClasseLegenda("[leg_layer_name]",[leg_class_index])' >
 						[if name=layer_type oper=eq value=0]
 						<img src=[leg_icon  width=30 height=30 ] />
 						[/if]
@@ -45,8 +46,11 @@
 						[if name=layer_type oper=eq value=8]
 						<img src=[leg_icon  width=30 height=16 ] />
 						[/if]
+						<span style="font-size:11px;position:relative;left:2px;top: -3px;" >[leg_class_name]&nbsp;</span>
+						<div class='i3GEOiconeEditar' style='display:none;float:right;top:4px;' ></div>
+
+						</span>
 					</td>
-					<td style="text-align:left;width:195px" ><span style="font-size:11px;position:relative;left:2px;" >[leg_class_name]</span></td>
 				</tr>
 		[/if]
 	[/if]
diff --git a/classesjs/classe_tema.js b/classesjs/classe_tema.js
index 7568d02..fe3cd96 100644
--- a/classesjs/classe_tema.js
+++ b/classesjs/classe_tema.js
@@ -734,6 +734,33 @@ i3GEO.tema =
 					"i3GEOF.legenda.iniciaJanelaFlutuante()");
 			},
 			/**
+			 * Function: editaClasseLegenda
+			 *
+			 * Abre a janela de dialogo da ferramenta legenda deiretamente no editor de simbolo de uma classe especifica
+			 *
+			 * Parametros:
+			 *
+			 * {string} - id que identifica o tema conforme definido no map file
+			 */
+			editaClasseLegenda : function(idtema,idclasse) {
+				i3GEO.mapa.ativaTema(idtema);
+				var temp = function() {
+					i3GEOF.legenda.aposIniciar = function(){
+						i3GEOF.legenda.classe = 0;
+						i3GEOF.legenda.estilo = 0;
+						i3GEOF.legenda.editaSimbolo('i3GEOlegendaid_'+idtema+"-"+idclasse);
+						i3GEOF.legenda.aposIniciar = function(){};
+					};
+					i3GEOF.legenda.iniciaJanelaFlutuante(idtema);
+				};
+				i3GEO.util.dialogoFerramenta(
+					"i3GEO.tema.dialogo.editaLegenda()",
+					"legenda",
+					"legenda",
+					"dependencias.php",
+					temp);
+			},
+			/**
 			 * Function: download
 			 *
 			 * Abre a janela de dialogo da ferramenta download
diff --git a/ferramentas/legenda/index.js b/ferramentas/legenda/index.js
index 54c10b3..9667313 100644
--- a/ferramentas/legenda/index.js
+++ b/ferramentas/legenda/index.js
@@ -100,6 +100,14 @@ i3GEOF.legenda =
 		 */
 		MUSTACHE : "",
 		/**
+		 * Funcao do usuario que e executada apos iniciar a ferramenta
+		 */
+		aposIniciar : function(){
+			i3GEOF.legenda.classe = 0;
+			i3GEOF.legenda.estilo = 0;
+			i3GEOF.legenda.editaSimbolo('i3GEOlegendaid_'+i3GEOF.legenda.tema+"-0");
+		},
+		/**
 		 * Susbtitutos para o template
 		 */
 		mustacheHash : function() {
@@ -373,8 +381,10 @@ i3GEOF.legenda =
 					i3GEO.tema.invertestatuslegenda(i3GEOF.legenda.tema);
 				};
 				i3GEO.util.aplicaAquarela("i3GEOF.legenda_corpo");
+				i3GEOF.legenda.aposIniciar.call();
 			} catch (erro) {
 				i3GEO.janela.tempoMsg(erro);
+				i3GEOF.legenda.aposIniciar = function(){};
 			}
 			i3GEO.guias.ajustaGuiaFerramenta("i3GEOF.legenda", "i3GEOlegenda");
 		},
@@ -1338,7 +1348,7 @@ i3GEOF.legenda =
 				}
 				var item = $i("i3GEOlegendaitensMetade").getElementsByTagName("select")[0].value,
 					itemid = $i("i3GEOlegendaitensMetadeId").getElementsByTagName("select")[0].value,
-					ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten), 
+					ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten),
 					p = i3GEO.configura.locaplic + "/classesphp/mapa_controle.php?g_sid="
 						+ i3GEO.configura.sid
 						+ "&funcao=alteraclasse"
@@ -1351,8 +1361,8 @@ i3GEOF.legenda =
 						+ "&opcao=metade&ignorar="
 						+ $i("i3GEOlegendaignorar").value
 						+ "&ext="
-						+ ext, 
-						cp = new cpaint(), 
+						+ ext,
+						cp = new cpaint(),
 						fim = function() {
 							i3GEOF.legenda.aposAlterarLegenda();
 							i3GEOF.legenda.aguarde.visibility = "hidden";
diff --git a/js/tema.js b/js/tema.js
index ac9e423..acc3f7a 100644
--- a/js/tema.js
+++ b/js/tema.js
@@ -601,7 +601,7 @@ i3GEO.tema =
 			 * Parametros:
 			 *
 			 * {string} - codigo do tema
-			 * 
+			 *
 			 * {objeto} - propriedades (ver ferramentas/graficotema/index.js funcao iniciaJanelaFlutuante)
 			 */
 			graficotema : function(idtema,propriedades) {
@@ -732,6 +732,33 @@ i3GEO.tema =
 					"i3GEOF.legenda.iniciaJanelaFlutuante()");
 			},
 			/**
+			 * Function: editaClasseLegenda
+			 *
+			 * Abre a janela de dialogo da ferramenta legenda deiretamente no editor de simbolo de uma classe especifica
+			 *
+			 * Parametros:
+			 *
+			 * {string} - id que identifica o tema conforme definido no map file
+			 */
+			editaClasseLegenda : function(idtema,idclasse) {
+				i3GEO.mapa.ativaTema(idtema);
+				var temp = function() {
+					i3GEOF.legenda.aposIniciar = function(){
+						i3GEOF.legenda.classe = 0;
+						i3GEOF.legenda.estilo = 0;
+						i3GEOF.legenda.editaSimbolo('i3GEOlegendaid_'+idtema+"-"+idclasse);
+						i3GEOF.legenda.aposIniciar = function(){};
+					};
+					i3GEOF.legenda.iniciaJanelaFlutuante(idtema);
+				};
+				i3GEO.util.dialogoFerramenta(
+					"i3GEO.tema.dialogo.editaLegenda()",
+					"legenda",
+					"legenda",
+					"dependencias.php",
+					temp);
+			},
+			/**
 			 * Function: download
 			 *
 			 * Abre a janela de dialogo da ferramenta download
--
libgit2 0.21.2