diff --git a/ferramentas/atalhosedicao/template_mst.html b/ferramentas/atalhosedicao/template_mst.html
index b9e7ec2..628fc7e 100755
--- a/ferramentas/atalhosedicao/template_mst.html
+++ b/ferramentas/atalhosedicao/template_mst.html
@@ -2,25 +2,25 @@
 	<a title="{{{salvaTip}}}" onclick="i3GEOF.atalhosedicao.salva()" class='btn btn-warning btn-lg btn-block btn-raised' href='javascript:void(0)' >
 	{{{salva}}}
 	</a>
-	<a title="{{{legendaTip}}}" onclick="i3GEO.temaAtivo = i3GEOF.atalhosedicao.tema;i3GEO.tema.dialogo.editaLegenda();" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' >
+	<a title="{{{legendaTip}}}" onclick="i3GEO.tema.dialogo.editaLegenda(i3GEOF.atalhosedicao.tema);" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' >
 	{{{legenda}}}
 	</a>
-	<a title="{{{tabelaTip}}}" onclick="i3GEO.temaAtivo = i3GEOF.atalhosedicao.tema;i3GEO.tema.dialogo.tabela();" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' >
+	<a title="{{{tabelaTip}}}" onclick="i3GEO.tema.dialogo.tabela(i3GEOF.atalhosedicao.tema);" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' >
 	{{{tabela}}}
 	</a>
-	<a title="{{{textoTip}}}" onclick="i3GEO.temaAtivo = i3GEOF.atalhosedicao.tema;i3GEO.tema.dialogo.toponimia();" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' >
+	<a title="{{{textoTip}}}" onclick="i3GEO.tema.dialogo.toponimia(i3GEOF.atalhosedicao.tema);" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' >
 	{{{texto}}}
 	</a>
-	<a title="{{{etiquetaTip}}}" onclick="i3GEO.temaAtivo = i3GEOF.atalhosedicao.tema;i3GEO.tema.dialogo.etiquetas();" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' >
+	<a title="{{{etiquetaTip}}}" onclick="i3GEO.tema.dialogo.etiquetas(i3GEOF.atalhosedicao.tema);" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' >
 	{{{etiqueta}}}
 	</a>
-    <a title="{{{funcaojsTip}}}" onclick="i3GEO.temaAtivo = i3GEOF.atalhosedicao.tema;i3GEO.tema.dialogo.funcaojstip();" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' >
+    <a title="{{{funcaojsTip}}}" onclick="i3GEO.temaAtivo = i3GEOF.atalhosedicao.tema;i3GEO.tema.dialogo.funcaojstip(i3GEO.temaAtivo);" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' >
     {{{funcaojsTitulo}}}
     </a>
-	<a title="{{{filtroTip}}}" onclick="i3GEO.temaAtivo = i3GEOF.atalhosedicao.tema;i3GEO.tema.dialogo.filtro();" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' >
+	<a title="{{{filtroTip}}}" onclick="i3GEO.tema.dialogo.filtro(i3GEOF.atalhosedicao.tema);" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' >
 	{{{filtro}}}
 	</a>
-	<a title="{{{temacomgraficoTip}}}" onclick="i3GEOF.atalhosedicao.temaComGrafico();" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' >
+	<a title="{{{temacomgraficoTip}}}" onclick="i3GEO.temaAtivo = i3GEOF.atalhosedicao.tema;i3GEOF.atalhosedicao.temaComGrafico(i3GEOF.atalhosedicao.tema);" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' >
 	{{{temacomgrafico}}}
 	</a>
 
diff --git a/interface/inc/barradeicones.php b/interface/inc/barradeicones.php
index c796840..eaefaa5 100644
--- a/interface/inc/barradeicones.php
+++ b/interface/inc/barradeicones.php
@@ -37,7 +37,7 @@
         <button title="GPS" onclick="i3GEO.navega.geolocal.start()" style="float: left; cursor: pointer;">
             <i class="material-icons">gps_fixed</i>
         </button>
-        <button title="{{{itensvisib}}}" onclick="i3GEO.mapa.itensvisib(['.ol-i3GEOcontrols','.iconesGuiaMovel','.ol-attribution button','.escalanumerica','.localizarxy','.i3GEOfechaGuia'])" style="float: left; cursor: pointer;">
+        <button title="{{{itensvisib}}}" onclick="i3GEO.mapa.itensvisib(['.check','.ol-i3GEOcontrols','.iconesGuiaMovel','.ol-attribution button','.escalanumerica','.localizarxy','.i3GEOfechaGuia'])" style="float: left; cursor: pointer;">
             <i class="material-icons">visibility</i>
         </button>
         <button class="hidden-xs toggle" title="{{{d18t}}}" onclick="i3GEO.navega.lente.start()" style="float: left; cursor: pointer; display: none;">
diff --git a/interface/templates/camada.html b/interface/templates/camada.html
index 92a0333..07f7d77 100755
--- a/interface/templates/camada.html
+++ b/interface/templates/camada.html
@@ -61,7 +61,6 @@
             <li><a href='javascript:void(0)' onclick="i3GEO.tema.dialogo.filtro('{{name}}')" class='{{isnotvetor}} '>
                     <span class="glyphicon glyphicon-filter"></span> {{{filtroTexto}}}
                 </a></li>
-
             <li><a class="{{{sel}}}" href="javascript:void(0)" onclick="i3GEO.tema.limpasel('{{{name}}}')" title="{{{selTitle}}}">
                     <span class="glyphicon glyphicon-erase"></span> {{{limpaselTexto}}}
                 </a></li>
diff --git a/js/tema.js b/js/tema.js
index 4f3eac7..5d04f13 100755
--- a/js/tema.js
+++ b/js/tema.js
@@ -757,20 +757,15 @@ i3GEO.tema =
 	     * {string} - id que identifica o tema conforme definido no map file
 	     */
 	    etiquetas : function(idtema) {
-		if(idtema && idtema != ""){
-		    var t = i3GEO.arvoreDeCamadas.pegaTema(idtema);
-		    if(t.status < 2){
-			i3GEO.janela.snackBar({content: $trad("deveLigada"),style: "red"});
-			return;
-		    }
-		}
-		i3GEO.mapa.ativaTema(idtema);
+		var temp = function(){
+		    i3GEOF.etiqueta.start(idtema);
+		};
 		i3GEO.util.dialogoFerramenta(
-			"i3GEO.tema.dialogo.etiquetas()",
+			"i3GEO.tema.dialogo.etiqueta()",
 			"etiqueta",
 			"etiqueta",
 			"dependencias.php",
-		"i3GEOF.etiqueta.iniciaJanelaFlutuante()");
+		"i3GEOF.etiqueta.start()");
 	    },
 	    /**
 	     * Function: funcaojstip
--
libgit2 0.21.2