diff --git a/admin/admin.db b/admin/admin.db
index 8784236..5383f67 100755
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/ferramentas/opcoes_legenda/dicionario.js b/ferramentas/opcoes_legenda/dicionario.js
index 91778d1..78646e8 100755
--- a/ferramentas/opcoes_legenda/dicionario.js
+++ b/ferramentas/opcoes_legenda/dicionario.js
@@ -81,7 +81,7 @@ i3GEOF.opcoesLegenda.dicionario = {
 		es : ""
 	} ],
 	'fonte' : [ {
-		pt : "Fonte: (teste a fonte mais adequada para apresentação correta da acentuação)",
+		pt : "Fonte tipográfica",
 		en : "",
 		es : ""
 	} ],
diff --git a/ferramentas/opcoes_legenda/index.js b/ferramentas/opcoes_legenda/index.js
index 9d91e19..578998b 100755
--- a/ferramentas/opcoes_legenda/index.js
+++ b/ferramentas/opcoes_legenda/index.js
@@ -46,17 +46,7 @@ i3GEOF.opcoesLegenda = {
 		}
 		try{
 			$i(iddiv).innerHTML = i3GEOF.opcoesLegenda.html();
-			var b = new YAHOO.widget.Button(
-				"i3GEOopcoesLegendabotao1",
-				{onclick:{fn: i3GEOF.opcoesLegenda.executa}}
-			);
-			b.addClass("rodar");
-			b = new YAHOO.widget.Button(
-				"i3GEOopcoesLegendabotao2",
-				{onclick:{fn: i3GEOF.opcoesLegenda.testa}}
-			);
-			b.addClass("rodar");
-			i3GEO.util.comboFontes("i3GEOopcoesLegendafonte","i3GEOopcoesLegendafontef");
+			i3GEO.util.comboFontes("i3GEOopcoesLegendafonte","i3GEOopcoesLegendafontef","form-control");
 			i3GEOF.opcoesLegenda.parametrosAtuais();
 			i3GEO.util.aplicaAquarela("i3GEOF.opcoesLegenda_corpo");
 		}
@@ -229,8 +219,7 @@ i3GEOF.opcoesLegenda = {
 		var temp = function(retorno){
 				i3GEOF.opcoesLegenda.aguarde.visibility = "hidden";
 				eval(retorno.data);
-				$i("i3GEOopcoesLegendatesteLegenda").src = legimagem;
-				$i("i3GEOopcoesLegendatesteLegenda").style.display = "block";
+				i3GEO.janela.closeMsg("<img  src='" + legimagem + "'  />");
 			},
 			par = i3GEOF.opcoesLegenda.parametrosFormulario(),
 			p = i3GEO.configura.locaplic+"/ferramentas/opcoes_legenda/exec.php?g_sid="+i3GEO.configura.sid+"&funcao=testaLegenda"+par,
diff --git a/ferramentas/opcoes_legenda/template_mst.html b/ferramentas/opcoes_legenda/template_mst.html
index 1980cb2..f9335de 100755
--- a/ferramentas/opcoes_legenda/template_mst.html
+++ b/ferramentas/opcoes_legenda/template_mst.html
@@ -1,71 +1,61 @@
-<div style='margin-left: 5px'>
-	<p class='paragrafo'>{{{incluiNoMapa}}}:</p>
-	<div class='styled-select'>
-		<select id='i3GEOopcoesLegendastatus'>
-			<option value='3'>{{{sim}}}</option>
-			<option value='1'>{{{nao}}}</option>
-			<option value='0'>---</option>
-		</select>
-	</div>
-	<br>
-	<p class='paragrafo'>{{{corFundo}}}:</p>
-	<div class='i3geoForm100 i3geoFormIconeAquarela'>
-		<input type='text' id='i3GEOopcoesLegendaimagecolor' value='' />
-	</div>
-	<br>
-	<p class='paragrafo'>{{{contornoSimbolos}}}:</p>
-	<div class='i3geoForm100 i3geoFormIconeAquarela'>
-		<input type='text' id='i3GEOopcoesLegendaoutlinecolor' value='' />
-	</div>
-	<br>
-	<p class='paragrafo'>{{{posicao}}}:</p>
-	<div class='styled-select'>
-		<select id='i3GEOopcoesLegendaposition'>
-			<option value='101'>{{{supEsquerdo}}}</option>
-			<option value='107'>{{{supCentro}}}</option>
-			<option value='103' selected>{{{supDireito}}}</option>
-			<option value='104'>{{{infEsquerdo}}}</option>
-			<option value='108'>{{{infCentro}}}</option>
-			<option value='102'>{{{infDireito}}}</option>
-		</select>
-	</div>
-	<br>
-	<p class='paragrafo'>{{{espacamentoY}}}:</p>
-	<div class='i3geoForm i3geoFormIconeEdita'>
-		<input type='text' id='i3GEOopcoesLegendakeyspacingy' value='' />
-	</div>
-	<br>
-	<p class='paragrafo'>{{{espacamentoX}}}:</p>
-	<div class='i3geoForm i3geoFormIconeEdita'>
-		<input type='text' id='i3GEOopcoesLegendakeyspacingx' value='' />
-	</div>
-	<br>
-	<p class='paragrafo'>{{{tamanhoSimboloY}}}:</p>
-	<div class='i3geoForm i3geoFormIconeEdita'>
-		<input type='text' id='i3GEOopcoesLegendakeysizey' value='' />
-	</div>
-	<br>
-	<p class='paragrafo'>{{{tamanhoSimboloX}}}:</p>
-	<div class='i3geoForm i3geoFormIconeEdita'>
-		<input type='text' id='i3GEOopcoesLegendakeysizex' value='' />
-	</div>
-	<br>
-	<p class='paragrafo'>{{{tamanhoTexto}}}:</p>
-	<div class='i3geoForm i3geoFormIconeEdita'>
-		<input type='text' id='i3GEOopcoesLegendalabelsize' value='' />
-	</div>
-	<br>
-	<p class='paragrafo'>{{{fonte}}}:</p>
-	<div class='styled-select' id='i3GEOopcoesLegendafontef'></div>
-
-	<br>
-	<p class='paragrafo'>
-		<input id='i3GEOopcoesLegendabotao1' size='20' type='button' value='{{{aplica}}}' />
-	</p>
-	<br>
-	<p class='paragrafo'>
-		<input id='i3GEOopcoesLegendabotao2' size='20' type='button' value='{{{testa}}}' />
-	</p>
-	<br>
-	<img alt='teste' src='' id='i3GEOopcoesLegendatesteLegenda' style='display: none' />
+<div class='container-fluid'>
+	<div style="width: 100%;" class='form-group label-fixed condensed'>
+		<label class="control-label" for="i3GEOopcoesLegendastatus">{{{incluiNoMapa}}}</label>
+		<div style="width: 100%;" class="input-group">
+			<select class="form-control" id="i3GEOopcoesLegendastatus">
+				<option value='3'>{{{sim}}}</option>
+				<option value='1'>{{{nao}}}</option>
+				<option value='0'>---</option>
+			</select>
+		</div>
+	</div>
+	<div class='form-group label-fixed condensed'>
+		<label class="control-label" for="i3GEOopcoesLegendaimagecolor">{{{corFundo}}}</label>
+		<input class="form-control input-lg i3geoFormIconeAquarela" type='text' id='i3GEOopcoesLegendaimagecolor' value='' />
+	</div>
+	<div class='form-group label-fixed condensed'>
+		<label class="control-label" for="i3GEOopcoesLegendaoutlinecolor">{{{contornoSimbolos}}}</label>
+		<input class="form-control input-lg i3geoFormIconeAquarela" type='text' id='i3GEOopcoesLegendaoutlinecolor' value='' />
+	</div>
+	<div style="width: 100%;" class='form-group label-fixed condensed'>
+		<label class="control-label" for="i3GEOopcoesLegendaposition">{{{posicao}}}</label>
+		<div style="width: 100%;" class="input-group">
+			<select class="form-control" id="i3GEOopcoesLegendaposition">
+				<option value='101'>{{{supEsquerdo}}}</option>
+				<option value='107'>{{{supCentro}}}</option>
+				<option value='103' selected>{{{supDireito}}}</option>
+				<option value='104'>{{{infEsquerdo}}}</option>
+				<option value='108'>{{{infCentro}}}</option>
+				<option value='102'>{{{infDireito}}}</option>
+			</select>
+		</div>
+	</div>
+	<div class='form-group label-fixed condensed'>
+		<label class="control-label" for="i3GEOopcoesLegendakeyspacingy">{{{espacamentoY}}}</label>
+		<input class="form-control input-lg " type='text' id='i3GEOopcoesLegendakeyspacingy' value='' />
+	</div>
+	<div class='form-group label-fixed condensed'>
+		<label class="control-label" for="i3GEOopcoesLegendakeyspacingx">{{{espacamentoX}}}</label>
+		<input class="form-control input-lg " type='text' id='i3GEOopcoesLegendakeyspacingx' value='' />
+	</div>
+	<div class='form-group label-fixed condensed'>
+		<label class="control-label" for="i3GEOopcoesLegendakeysizey">{{{tamanhoSimboloY}}}</label>
+		<input class="form-control input-lg " type='text' id='i3GEOopcoesLegendakeysizey' value='' />
+	</div>
+	<div class='form-group label-fixed condensed'>
+		<label class="control-label" for="i3GEOopcoesLegendakeysizex">{{{tamanhoSimboloX}}}</label>
+		<input class="form-control input-lg " type='text' id='i3GEOopcoesLegendakeysizex' value='' />
+	</div>
+	<div class='form-group label-fixed condensed'>
+		<label class="control-label" for="i3GEOopcoesLegendalabelsize">{{{tamanhoTexto}}}</label>
+		<input class="form-control input-lg " type='text' id='i3GEOopcoesLegendalabelsize' value='' />
+	</div>
+	<div style="width: 100%;" class='form-group label-fixed condensed'>
+		<label class="control-label" for="">{{{fonte}}}</label>
+		<div style="width: 100%;" class="input-group">
+			<div id='i3GEOopcoesLegendafontef'></div>
+		</div>
+	</div>
+	<button onclick="i3GEOF.opcoesLegenda.executa()" class='btn btn-primary btn-sm btn-raised'>{{{aplica}}}</button>
+	<button onclick="i3GEOF.opcoesLegenda.testa()" class='btn btn-primary btn-sm btn-raised'>{{{testa}}}</button>
 </div>
\ No newline at end of file
--
libgit2 0.21.2