diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/model/TarjaAssinaturaVH.java b/cit-ecm-api/src/main/java/br/com/centralit/api/model/TarjaAssinaturaVH.java
deleted file mode 100644
index 1188630..0000000
--- a/cit-ecm-api/src/main/java/br/com/centralit/api/model/TarjaAssinaturaVH.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package br.com.centralit.api.model;
-
-import java.io.Serializable;
-
-import com.fasterxml.jackson.annotation.JsonView;
-
-import br.com.centralit.api.framework.json.ViewsEcm;
-
-public class TarjaAssinaturaVH implements Serializable{
-
-	private static final long serialVersionUID = -82446677470229523L;
-
-	@JsonView({ ViewsEcm.TarjaAssinaturaEditview.class })
-	private TarjaAssinatura assinaturaInterna;
-
-	@JsonView({ ViewsEcm.TarjaAssinaturaEditview.class })
-	private TarjaAssinatura assinaturaCertificado;
-
-
-	public TarjaAssinatura getAssinaturaInterna() {
-
-		return assinaturaInterna;
-	}
-
-
-	public void setAssinaturaInterna(TarjaAssinatura assinaturaInterna) {
-
-		this.assinaturaInterna = assinaturaInterna;
-	}
-
-
-	public TarjaAssinatura getAssinaturaCertificado() {
-
-		return assinaturaCertificado;
-	}
-
-
-	public void setAssinaturaCertificado(TarjaAssinatura assinaturaCertificado) {
-
-		this.assinaturaCertificado = assinaturaCertificado;
-	}
-}
diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/service/TarjaAssinaturaService.java b/cit-ecm-api/src/main/java/br/com/centralit/api/service/TarjaAssinaturaService.java
index db39193..bc9e194 100644
--- a/cit-ecm-api/src/main/java/br/com/centralit/api/service/TarjaAssinaturaService.java
+++ b/cit-ecm-api/src/main/java/br/com/centralit/api/service/TarjaAssinaturaService.java
@@ -3,7 +3,6 @@ package br.com.centralit.api.service;
 import org.springframework.web.multipart.MultipartFile;
 
 import br.com.centralit.api.model.TarjaAssinatura;
-import br.com.centralit.api.model.TarjaAssinaturaVH;
 import br.com.centralit.framework.service.arquitetura.GenericService;
 
 /**
@@ -35,21 +34,6 @@ public interface TarjaAssinaturaService extends GenericService<TarjaAssinatura, 
 
 	/**
 	 *
-	 * M&eacute;todo respons&aacute;vel por retornar todas as tarjas de assinatura existentes no banco.
-	 * Normalmente existem apenas dois tipos fixos de tarjas:</br>
-	 * <ul>
-	 * <li>Tarja de assinatura interna</li>
-	 * <li>Tarja de assinatura de certificado digital</li>
-	 * </ul>
-	 *
-	 * @author ciro.junior (<a href="mailto:ciro.junior@centralit.com.br">ciro.junior@centralit.com.br</a>)
-	 *
-	 * @return
-	 */
-	TarjaAssinaturaVH getAllTarjas ();
-
-	/**
-	 *
 	 * M&eacute;todo respons&aacute;vel por salvar os dois tipos de tarjas de assinatura ao mesmo tempo
 	 *
 	 * @author ciro.junior (<a href="mailto:ciro.junior@centralit.com.br">ciro.junior@centralit.com.br</a>)
@@ -57,5 +41,5 @@ public interface TarjaAssinaturaService extends GenericService<TarjaAssinatura, 
 	 * @param tarjaAssinaturaVH
 	 * @return
 	 */
-	TarjaAssinaturaVH save (TarjaAssinaturaVH tarjaAssinaturaVH);
+	TarjaAssinatura save (TarjaAssinatura tarjaAssinatura);
 }
diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/InicializarEcmServiceImpl.java b/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/InicializarEcmServiceImpl.java
index e271be3..b8794e6 100644
--- a/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/InicializarEcmServiceImpl.java
+++ b/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/InicializarEcmServiceImpl.java
@@ -344,7 +344,7 @@ public class InicializarEcmServiceImpl extends UtilStartup {
 		pgTarjaAssinatura = this.paginaService.saveIfNotExist(pgTarjaAssinatura);
 
 		Menu menuTarjaAssinatura = new Menu("Tarja de Assinatura", pgTarjaAssinatura, menuCadastroBasico, 0, 9, null, null, null, null, modulo);
-		menuTarjaAssinatura.setIncludes(this.gerarArquivosMenu(menuTarjaAssinatura, this.CIT_ECM_WEB_ANGULAR, "TarjaAssinatura", true, false, true));
+		menuTarjaAssinatura.setIncludes(this.gerarArquivosMenu(menuTarjaAssinatura, this.CIT_ECM_WEB_ANGULAR, "TarjaAssinatura", true, true, true));
 		this.menuService.mergeIfNotExist(menuTarjaAssinatura);
 	}
 
diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/TarjaAssinaturaServiceImpl.java b/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/TarjaAssinaturaServiceImpl.java
index 6bd7cbe..2cc6ad1 100644
--- a/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/TarjaAssinaturaServiceImpl.java
+++ b/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/TarjaAssinaturaServiceImpl.java
@@ -1,8 +1,6 @@
 package br.com.centralit.api.service.impl;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,13 +11,11 @@ import org.springframework.web.multipart.MultipartFile;
 
 import br.com.centralit.api.dao.TarjaAssinaturaDao;
 import br.com.centralit.api.model.TarjaAssinatura;
-import br.com.centralit.api.model.TarjaAssinaturaVH;
 import br.com.centralit.api.service.AnexoImagemService;
 import br.com.centralit.api.service.OrganizacaoService;
 import br.com.centralit.api.service.TarjaAssinaturaService;
 import br.com.centralit.framework.model.AnexoImagem;
 import br.com.centralit.framework.model.Organizacao;
-import br.com.centralit.framework.model.arquitetura.PersistentObject;
 import br.com.centralit.framework.service.arquitetura.GenericServiceImpl;
 
 /**
@@ -55,13 +51,8 @@ public class TarjaAssinaturaServiceImpl extends GenericServiceImpl<TarjaAssinatu
 		this.validator = validator;
 	}
 
-	public TarjaAssinaturaVH save (TarjaAssinaturaVH tarjaAssinaturaVH){
-		TarjaAssinaturaVH tarjaAssinaturaVHSaved = new TarjaAssinaturaVH();
-		if(tarjaAssinaturaVH.getAssinaturaInterna() != null && tarjaAssinaturaVH.getAssinaturaCertificado() != null){
-			tarjaAssinaturaVHSaved.setAssinaturaInterna(this.merge(tarjaAssinaturaVH.getAssinaturaInterna()));
-			tarjaAssinaturaVHSaved.setAssinaturaCertificado(this.merge(tarjaAssinaturaVH.getAssinaturaCertificado()));
-		}
-		return tarjaAssinaturaVHSaved;
+	public TarjaAssinatura save (TarjaAssinatura tarjaAssinatura){
+		return this.merge(tarjaAssinatura);
 	}
 
 	@Override
@@ -90,27 +81,4 @@ public class TarjaAssinaturaServiceImpl extends GenericServiceImpl<TarjaAssinatu
 					+ "identificar a causa: ", ioe.getCause());
 		}
 	}
-
-	/**{@inheritDoc}*/
-	@Override
-	public TarjaAssinaturaVH getAllTarjas () {
-
-		TarjaAssinaturaVH tarjaAssinaturaVH = new TarjaAssinaturaVH();
-		List<PersistentObject> tarjas = tarjaAssinaturaDao.findAll();
-		List<TarjaAssinatura> tarjasAssinatura = new ArrayList<>();
-		for (PersistentObject item : tarjas) {
-			if(item instanceof TarjaAssinatura){
-				tarjasAssinatura.add((TarjaAssinatura) item);
-			}
-		}
-		for (TarjaAssinatura tarjaAssinatura : tarjasAssinatura) {
-			if(tarjaAssinatura.getTipoAssinatura().getCodigo() == 1L){
-				tarjaAssinaturaVH.setAssinaturaInterna(tarjaAssinatura);
-				continue;
-			}
-			tarjaAssinaturaVH.setAssinaturaCertificado(tarjaAssinatura);
-		}
-		return tarjaAssinaturaVH;
-	}
-
 }
diff --git a/cit-ecm-web/src/main/java/br/com/centralit/controller/TarjaAssinaturaController.java b/cit-ecm-web/src/main/java/br/com/centralit/controller/TarjaAssinaturaController.java
index adc622d..b15166f 100644
--- a/cit-ecm-web/src/main/java/br/com/centralit/controller/TarjaAssinaturaController.java
+++ b/cit-ecm-web/src/main/java/br/com/centralit/controller/TarjaAssinaturaController.java
@@ -13,11 +13,9 @@ import org.springframework.web.multipart.MultipartFile;
 
 import br.com.centralit.api.framework.json.ViewsEcm;
 import br.com.centralit.api.model.TarjaAssinatura;
-import br.com.centralit.api.model.TarjaAssinaturaVH;
 import br.com.centralit.api.service.TarjaAssinaturaService;
 import br.com.centralit.framework.controller.GenericController;
 import br.com.centralit.framework.json.ResponseBodyWrapper;
-import br.com.centralit.framework.view.ResultResponseVH;
 
 @Controller
 @RequestMapping("/rest/tarjaAssinatura")
@@ -42,21 +40,10 @@ public class TarjaAssinaturaController extends GenericController<TarjaAssinatura
 	}
 
 	@ResponseBody
-	@RequestMapping(value = "/getAllTarjas", method = RequestMethod.GET, produces = "application/json")
-	public ResponseBodyWrapper getAllTarjas () {
-
-		ResultResponseVH<TarjaAssinaturaVH> resultResponseVH = new ResultResponseVH<TarjaAssinaturaVH>(this.tarjaAssinaturaService.getAllTarjas());
-		ResponseBodyWrapper responseBody = new ResponseBodyWrapper(resultResponseVH, this.getEditView());
-
-		return responseBody;
-
-	}
-
-	@ResponseBody
 	@RequestMapping(value = "/saveTarjaAssinatura", method = RequestMethod.POST, produces = "application/json")
-	public ResponseBodyWrapper save(@RequestBody TarjaAssinaturaVH tarjaAssinaturaVH) throws Exception {
+	public ResponseBodyWrapper save(@RequestBody TarjaAssinatura tarjaAssinatura) throws Exception {
 
-		ResponseBodyWrapper responseBody = new ResponseBodyWrapper(this.tarjaAssinaturaService.save(tarjaAssinaturaVH), getEditView());
+		ResponseBodyWrapper responseBody = new ResponseBodyWrapper(this.tarjaAssinaturaService.save(tarjaAssinatura), getEditView());
 
 		return responseBody;
 	}
diff --git a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/TarjaAssinaturaController.js b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/TarjaAssinaturaController.js
index c309912..697657b 100644
--- a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/TarjaAssinaturaController.js
+++ b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/TarjaAssinaturaController.js
@@ -19,12 +19,12 @@ citApp.controller('TarjaAssinaturaController',
 
   $scope.resetForm = function() {
       $scope.tarjaAssinatura = {
-          assinaturaInterna : {tipoAssinatura : $scope.tipoAssinaturaInterna},
-          assinaturaCertificado : {tipoAssinatura : $scope.tipoAssinaturaCertificado}
+    		descricao : "",
+    		tipoAssinatura : {}
       };
-      if ($scope.uploaderLogoTarjaAssinaturaInterna && $scope.uploaderLogoTarjaAssinaturaCertificado){
-        $scope.uploaderLogoTarjaAssinaturaInterna.clearQueue();
-        $scope.uploaderLogoTarjaAssinaturaCertificado.clearQueue();
+
+      if ($scope.uploaderLogo){
+        $scope.uploaderLogo.clearQueue();
       }
 
       $scope.edit = true;
@@ -35,7 +35,6 @@ citApp.controller('TarjaAssinaturaController',
         }
       });
     };
-    $scope.resetForm();
 
   DominioRepository.buscaDominioByCodigoAndChave(1, 'tipoAssinatura').then(function(result) {
     $scope.tipoAssinaturaInterna = result.originalElement;
@@ -44,28 +43,21 @@ citApp.controller('TarjaAssinaturaController',
     $scope.tipoAssinaturaCertificado = result.originalElement;
   });
 
-  $scope.getAllTarjas = function(){
+  $scope.getTarjaAssinatura = function(id, edit) {
+	$scope.resetForm();
     $scope.setLoadingGet(true);
-    TarjaAssinaturaRepository.getAllTarjas().then(function(result) {
+    TarjaAssinaturaRepository.get(id).then(function(result) {
       $scope.tarjaAssinatura = result.originalElement;
-      $scope.edit = false;
+      $scope.edit = edit;
       $scope.setLoading(false);
     });
   };
-    $scope.getAllTarjas();
-
-    var vincularIdTarjaUploader = function () {
-    	if($scope.tarjaAssinatura.assinaturaInterna.id && $scope.tarjaAssinatura.assinaturaCertificado.id){
-    		$scope.uploaderLogoTarjaAssinaturaInterna.url += $scope.tarjaAssinatura.assinaturaInterna.id;
-    		$scope.uploaderLogoTarjaAssinaturaCertificado.url += $scope.tarjaAssinatura.assinaturaCertificado.id;
-    	}
-    };
 
-  $scope.saveOrUpdate = function(){
+  $scope.saveOrUpdate = function(form){
 
-    $scope.tarjaAssinaturaForm.$submitted = true;
+    form.$submitted = true;
 
-    if($scope.tarjaAssinaturaForm.$invalid){
+    if(form.$invalid){
         $scope.showAlert('error', $translate.instant('MSG.MN001'), " ", false);
         return;
     }
@@ -75,30 +67,34 @@ citApp.controller('TarjaAssinaturaController',
     TarjaAssinaturaRepository.save($scope.tarjaAssinatura).then(function(result) {
       $scope.tarjaAssinatura = result.originalElement;
       $scope.showAlert("success", $translate.instant('MSG.REGISTRO_SALVO'));
-      $scope.tarjaAssinaturaForm.$submitted = false;
+      form.$submitted = false;
       $scope.setLoading(false);
-      if($scope.uploaderLogoTarjaAssinaturaInterna.queue.length > 0 || $scope.uploaderLogoTarjaAssinaturaCertificado.queue.length > 0){
-        $scope.uploaderLogoTarjaAssinaturaInterna.uploadAll();
-        $scope.uploaderLogoTarjaAssinaturaCertificado.uploadAll();
+      if($scope.uploaderLogo.queue.length > 0){
+        $scope.uploaderLogo.uploadAll();
       }
     });
   };
 
   $scope.cancelarEdicao = function () {
     $scope.resetForm();
-    $scope.getAllTarjas();
+    $scope.$showPageSearchWorkspace($scope.workspace);
+    $scope.fetchResult();
     $scope.edit= false
   }
 
+	$scope.fetchResult = function(){
+		angular.element('#searchTarjaAssinatura').scope().fetchResult();
+	};
+
 //INSTANCIA DO OBJETO PARA FAZER UPLOAD
-  $scope.uploaderLogoTarjaAssinaturaInterna = new FileUploader({
+  $scope.uploaderLogo = new FileUploader({
     autoUpload: false,
     queueLimit: 1,
     url : '/cit-ecm-web/rest/tarjaAssinatura/uploadFileLogo?idOrganizacao=' + $scope.usuarioLogado.organizacao.id + '&idTarjaAssinatura='
   });
 
   // FILTERS
-  $scope.uploaderLogoTarjaAssinaturaInterna.filters.push({
+  $scope.uploaderLogo.filters.push({
     name: 'imageFilter',
     fn: function(item , options) {
       var type = '|' + item.type.slice(item.type.lastIndexOf('/') + 1) + '|';
@@ -107,96 +103,47 @@ citApp.controller('TarjaAssinaturaController',
   });
 
   // CALLBACKS
-  $scope.uploaderLogoTarjaAssinaturaInterna.onWhenAddingFileFailed = function(item , filter, options) {
-    $scope.uploaderLogoTarjaAssinaturaInterna.clearQueue();
+  $scope.uploaderLogo.onWhenAddingFileFailed = function(item , filter, options) {
+    $scope.uploaderLogo.clearQueue();
     console.info('onWhenAddingFileFailed', item, filter, options);
   };
-  $scope.uploaderLogoTarjaAssinaturaInterna.onAfterAddingFile = function(fileItem) {
+  $scope.uploaderLogo.onAfterAddingFile = function(fileItem) {
     console.info('onAfterAddingFile', fileItem);
   };
-  $scope.uploaderLogoTarjaAssinaturaInterna.onAfterAddingAll = function(addedFileItems) {
+  $scope.uploaderLogo.onAfterAddingAll = function(addedFileItems) {
     console.info('onAfterAddingAll', addedFileItems);
   };
-  $scope.uploaderLogoTarjaAssinaturaInterna.onBeforeUploadItem = function(item) {
+  $scope.uploaderLogo.onBeforeUploadItem = function(item) {
     console.info('onBeforeUploadItem', item);
   };
-  $scope.uploaderLogoTarjaAssinaturaInterna.onProgressItem = function(fileItem, progress) {
+  $scope.uploaderLogo.onProgressItem = function(fileItem, progress) {
     console.info('onProgressItem', fileItem, progress);
   };
-  $scope.uploaderLogoTarjaAssinaturaInterna.onProgressAll = function(progress) {
+  $scope.uploaderLogo.onProgressAll = function(progress) {
     console.info('onProgressAll', progress);
   };
-  $scope.uploaderLogoTarjaAssinaturaInterna.onSuccessItem = function(fileItem, response, status, headers) {
+  $scope.uploaderLogo.onSuccessItem = function(fileItem, response, status, headers) {
     console.info('onSuccessItem', fileItem, response, status, headers);
   };
-  $scope.uploaderLogoTarjaAssinaturaInterna.onErrorItem = function(fileItem, response, status, headers) {
+  $scope.uploaderLogo.onErrorItem = function(fileItem, response, status, headers) {
     console.info('onErrorItem', fileItem, response, status, headers);
   };
-  $scope.uploaderLogoTarjaAssinaturaInterna.onCancelItem = function(fileItem, response, status, headers) {
+  $scope.uploaderLogo.onCancelItem = function(fileItem, response, status, headers) {
     console.info('onCancelItem', fileItem, response, status, headers);
   };
-  $scope.uploaderLogoTarjaAssinaturaInterna.onCompleteItem = function(fileItem, response, status, headers) {
+  $scope.uploaderLogo.onCompleteItem = function(fileItem, response, status, headers) {
     console.info('onCompleteItem', fileItem, response, status, headers);
   };
-  $scope.uploaderLogoTarjaAssinaturaInterna.onCompleteAll = function() {
-    $scope.uploaderLogoTarjaAssinaturaInterna.clearQueue();
-    $scope.getAllTarjas()
+  $scope.uploaderLogo.onCompleteAll = function() {
+    $scope.uploaderLogo.clearQueue();
+    $scope.getTarjaAssinatura($scope.tarjaAssintura.id, $scope.edit)
     console.info('onCompleteAll');
   };
 
-//INSTANCIA DO OBJETO PARA FAZER UPLOAD
-  $scope.uploaderLogoTarjaAssinaturaCertificado = new FileUploader({
-    autoUpload: false,
-    queueLimit: 1,
-    url :'/cit-ecm-web/rest/tarjaAssinatura/uploadFileLogo?idOrganizacao=' + $scope.usuarioLogado.organizacao.id + '&idTarjaAssinatura='
-  });
-
-  // FILTERS
-  $scope.uploaderLogoTarjaAssinaturaCertificado.filters.push({
-    name: 'imageFilter',
-    fn: function(item , options) {
-      var type = '|' + item.type.slice(item.type.lastIndexOf('/') + 1) + '|';
-      return '|jpg|png|jpeg|bmp|gif|'.indexOf(type) !== -1;
-    }
-  });
-
-  // CALLBACKS
-  $scope.uploaderLogoTarjaAssinaturaCertificado.onWhenAddingFileFailed = function(item , filter, options) {
-	$scope.uploaderLogoTarjaAssinaturaCertificado.clearQueue();
-    console.info('onWhenAddingFileFailed', item, filter, options);
+  var vincularIdTarjaUploader = function () {
+  	if($scope.tarjaAssinatura.id){
+  		$scope.uploaderLogoTarjaAssinatura.url += $scope.tarjaAssinatura.id;
+  	}
   };
-  $scope.uploaderLogoTarjaAssinaturaCertificado.onAfterAddingFile = function(fileItem) {
-    console.info('onAfterAddingFile', fileItem);
-  };
-  $scope.uploaderLogoTarjaAssinaturaCertificado.onAfterAddingAll = function(addedFileItems) {
-    console.info('onAfterAddingAll', addedFileItems);
-  };
-  $scope.uploaderLogoTarjaAssinaturaCertificado.onBeforeUploadItem = function(item) {
-    console.info('onBeforeUploadItem', item);
-  };
-  $scope.uploaderLogoTarjaAssinaturaCertificado.onProgressItem = function(fileItem, progress) {
-    console.info('onProgressItem', fileItem, progress);
-  };
-  $scope.uploaderLogoTarjaAssinaturaCertificado.onProgressAll = function(progress) {
-    console.info('onProgressAll', progress);
-  };
-  $scope.uploaderLogoTarjaAssinaturaCertificado.onSuccessItem = function(fileItem, response, status, headers) {
-    console.info('onSuccessItem', fileItem, response, status, headers);
-  };
-  $scope.uploaderLogoTarjaAssinaturaCertificado.onErrorItem = function(fileItem, response, status, headers) {
-    console.info('onErrorItem', fileItem, response, status, headers);
-  };
-  $scope.uploaderLogoTarjaAssinaturaCertificado.onCancelItem = function(fileItem, response, status, headers) {
-    console.info('onCancelItem', fileItem, response, status, headers);
-  };
-  $scope.uploaderLogoTarjaAssinaturaCertificado.onCompleteItem = function(fileItem, response, status, headers) {
-    console.info('onCompleteItem', fileItem, response, status, headers);
-  };
-  $scope.uploaderLogoTarjaAssinaturaCertificado.onCompleteAll = function() {
-	$scope.uploaderLogoTarjaAssinaturaCertificado.clearQueue();
-    $scope.getAllTarjas();
-    console.info('onCompleteAll');
-  };
-
   vincularIdTarjaUploader();
 }]);
diff --git a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/TarjaAssinaturaListController.js b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/TarjaAssinaturaListController.js
index 43fcb68..f670c09 100644
--- a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/TarjaAssinaturaListController.js
+++ b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/TarjaAssinaturaListController.js
@@ -17,8 +17,8 @@ citApp.controller('TarjaAssinaturaListController',
         angular.element("#editTarjaAssinatura").scope().resetForm();
     };
 
-    $scope.headers = [ {title : $translate.instant('LABEL.TIPO_ASSINATURA'), value : 'dominio.tipoAssinatura' },
-                       {title : $translate.instant('LABEL.DESCRICAO'), value : 'descricao' }];
+    $scope.headers = [ {title : $translate.instant('LABEL.DESCRICAO'), value : 'descricao' },
+                       {title : $translate.instant('LABEL.TIPO_ASSINATURA'), value : 'dominio.tipoAssinatura' }];
 
     $scope.filterCriteria = {
         start : 1,
@@ -34,14 +34,15 @@ citApp.controller('TarjaAssinaturaListController',
 		$scope.filterCriteria.filters[0].listaDominio = result;
 	});
 
-    $scope.abrirVisualizar = function(edit){
+    $scope.editarVisualizarTarjaAssinatura = function(edit){
         var tarjaAssinatura = $scope.tarjaAssinaturaChecked;
 
         if(!tarjaAssinatura) {
-            $scope.showAlert('warning', !edit ? $translate.instant('MSG.SELECIONE_UM_ITEM_PARA_VISUALIZACAO') : $translate.instant('MSG.SELECIONE_UM_ITEM_PARA_EDICAO'));
+            $scope.showAlert('warning', !edit ? $translate.instant('MSG.SELECIONE_UM_ITEM_PARA_VISUALIZACAO') :
+            									$translate.instant('MSG.SELECIONE_UM_ITEM_PARA_EDICAO'));
             return;
         }
-        angular.element('#editTarjaAssinatura').scope().getTarjaAssinatura(tarjaAssinatura, edit);
+        angular.element('#editTarjaAssinatura').scope().getTarjaAssinatura(tarjaAssinatura.id, edit);
         $scope.$showPageEditWorkspace($scope.workspace);
     };
 }]);
diff --git a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/repository/TarjaAssinaturaRepository.js b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/repository/TarjaAssinaturaRepository.js
index 8fc12cd..93a09e0 100644
--- a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/repository/TarjaAssinaturaRepository.js
+++ b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/repository/TarjaAssinaturaRepository.js
@@ -5,10 +5,6 @@ citApp.factory('TarjaAssinaturaRepository', ['RestangularEcm', 'AbstractReposito
     function TarjaAssinaturaRepository() {
     	AbstractRepository.call(this, restangularEcm, 'rest/tarjaAssinatura');
 
-		this.getAllTarjas = function() {
-			return restangularEcm.one(this.route + "/getAllTarjas" ).get();
-		};
-
 		this.save = function(tarjaAssinatura) {
 			return restangularEcm.all(this.route + "/saveTarjaAssinatura").post(tarjaAssinatura).then();
 		};
diff --git a/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinatura.html b/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinatura.html
index cc50e76..8271ad9 100644
--- a/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinatura.html
+++ b/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinatura.html
@@ -1,2 +1,2 @@
-<div ng-include src="'/cit-ecm-web/html/tarjaAssinatura/tarjaAssinaturaEdit.html'"></div>
-<!-- <div ng-include src="'/cit-ecm-web/html/tarjaAssinatura/tarjaAssinaturaList.html'" ng-show="workspace.$showSearch"></div> -->
+<div ng-include src="'/cit-ecm-web/html/tarjaAssinatura/tarjaAssinaturaList.html'" ng-show="workspace.$showSearch"></div>
+<div ng-include src="'/cit-ecm-web/html/tarjaAssinatura/tarjaAssinaturaEdit.html'" ng-show="workspace.$showEdit"></div>
diff --git a/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaEdit.html b/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaEdit.html
index 678f874..679c07d 100644
--- a/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaEdit.html
+++ b/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaEdit.html
@@ -30,121 +30,58 @@
 
 	<breadcrumb ng-workspace="workspace"></breadcrumb>
 	<form name="tarjaAssinaturaForm">
-	<tabset class="tabbable margin-top margin-bottom">
-		<tab>
-			<tab-heading><translate>ECM.LABEL.ASSINATURA_INTERNA</translate></tab-heading>
-<!-- 			<form name="tarjaAssinaturaInternaForm"> -->
-				<p><small>( <span class="red">*</span> ) <translate>LABEL.CAMPOS_OBRIGATORIOS</translate></small></p>
-				<fieldset>
-					<legend>
-						<translate>ECM.LABEL.DADOS_TARJA_ASSINATURA_INTERNA</translate>
-					</legend>
-				</fieldset>
-				<div class="row">
-					<div class="col-md-6">
-						<label-input ng-id="tarjaAssinatura.assinaturaInterna.descricao" ng-label="LABEL.DESCRICAO" ng-type="text"
-							ng-model="tarjaAssinatura.assinaturaInterna.descricao" form="tarjaAssinaturaForm" ng-obrigatorio="true"
-							ng-custom-maxlength="100" ng-type="text" ng-disabled="!edit" />
-					</div>
-					<div class="col-md-4">
-						<label-input ng-id="tarjaAssinatura.assinaturaInterna.tipoAssinatura" ng-label="ECM.LABEL.TIPO_ASSINATURA" ng-type="text"
-									ng-disabled="true" ng-model="tarjaAssinatura.assinaturaInterna.tipoAssinatura.descricao" form="tarjaAssinaturaForm"
-									ng-obrigatorio="false" ng-type="text" />
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-sm-12">
-						<div class="form-group" ng-disable="!edit">
-							<label class="control-label"><translate>ECM.LABEL.LOGO_TARJA_ASSINATURA</translate></label>
-							<div ng-if="tarjaAssinatura.assinaturaInterna.anexoImagem.anexo == undefined" nv-file-drop="" uploader="uploaderLogoTarjaAssinaturaInterna"
-								onclick="this.edit ? $('#uploadLogoTarjaAssinaturaInterna').click() : null">
-								<div nv-file-over="" uploader="uploaderLogoTarjaAssinaturaInterna" over-class="another-file-over-class" class="well my-drop-zone">
-									<span ng-show="uploaderLogoTarjaAssinaturaInterna.queue.length <= 0"><translate>MSG.ARRASTE_SOLTE_ARQUIVO</translate></span>
-									<span ng-show="uploaderLogoTarjaAssinaturaInterna.queue.length > 0">{{uploaderLogoTarjaAssinaturaInterna.queue[0].file.name}}</span>
-								</div>
-							</div>
-							<input id="uploadLogoTarjaAssinaturaInterna" type="file" nv-file-select="" uploader="uploaderLogoTarjaAssinaturaInterna" ng-show="false" />
-						</div><!-- .form-group -->
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-sm-12" ng-show="tarjaAssinatura.assinaturaInterna.anexoImagem.anexo">
-						<img ng-src="data:image/JPEG;base64,{{tarjaAssinatura.assinaturaInterna.anexoImagem.anexo}}" class="img-thumbnail" style="max-width: 300px; height: auto;">
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-md-12">
-						<div class="form-group">
-							<label class="control-label block" ng-class="{'has-error': !tarjaAssinatura.assinaturaInterna.conteudo && tarjaAssinaturaForm.$submitted}">
-								<translate>ECM.LABEL.CONTEUDO_HTML</translate> <span class="red">*</span>
-								<i ng-show="!tarjaAssinatura.assinaturaInterna.conteudo && tarjaAssinaturaForm.$submitted" class='fa fa-warning red'
-									tooltip="{{$translate.instant('ECM.LABEL.CONTEUDO_HTML') + ' ' +$translate.instant('LABEL.CAMPO_OBRIGATORIO')}}"
-									tooltip-placement='top'></i>
-							</label>
-							<div id="tarjaAssinatura.assinaturaInterna.conteudo" ckeditor="options" ng-if='edit' ready="onReady()" ng-model="tarjaAssinatura.assinaturaInterna.conteudo" ></div>
-							<iframe id="visualizacaoConteudoTarjaAssinatura" srcdoc="{{tarjaAssinatura.assinaturaInterna.conteudo}}" allowfullscreen class="iframe-report" ng-show="!edit" style="min-height: 100px !important;"></iframe>
-						</div>
-					</div>
-				</div>
-<!-- 			</form> -->
-		</tab>
-
-		<tab>
-			<tab-heading><translate>ECM.LABEL.ASSINATURA_CERTIFICADO_DIGITAL</translate></tab-heading>
-				<p><small>( <span class="red">*</span> ) <translate>LABEL.CAMPOS_OBRIGATORIOS</translate></small></p>
-				<fieldset>
-					<legend>
-						<translate>ECM.LABEL.DADOS_TARJA_ASSINATURA_CERTIFICADO_DIGITAL</translate>
-					</legend>
-				</fieldset>
-				<div class="row">
-					<div class="col-md-6">
-						<label-input ng-id="tarjaAssinatura.assinaturaCertificado.descricao" ng-label="LABEL.DESCRICAO" ng-type="text"
-							ng-model="tarjaAssinatura.assinaturaCertificado.descricao" form="tarjaAssinaturaForm" ng-obrigatorio="true"
-							ng-custom-maxlength="100" ng-type="text" ng-disabled="!edit" />
-					</div>
-					<div class="col-md-4">
-						<label-input ng-id="tarjaAssinatura.assinaturaCertificado.tipoAssinatura" ng-label="ECM.LABEL.TIPO_ASSINATURA" ng-type="text"
-									ng-disabled="true" ng-model="tarjaAssinatura.assinaturaCertificado.tipoAssinatura.descricao" form="tarjaAssinaturaForm"
-									ng-obrigatorio="false" ng-type="text" />
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-sm-12">
-						<div class="form-group">
-							<label class="control-label"><translate>ECM.LABEL.LOGO_TARJA_ASSINATURA</translate></label>
-							<div ng-if="tarjaAssinatura.assinaturaCertificado.anexoImagem.anexo == undefined" nv-file-drop="" uploader="uploaderLogoTarjaAssinaturaCertificado"
-								onclick="$('#uploadLogoTarjaAssinaturaCertificado').click()">
-								<div nv-file-over="" uploader="uploaderLogoTarjaAssinaturaCertificado" over-class="another-file-over-class" class="well my-drop-zone">
-									<span ng-show="uploaderLogoTarjaAssinaturaCertificado.queue.length <= 0"><translate>MSG.ARRASTE_SOLTE_ARQUIVO</translate></span>
-									<span ng-show="uploaderLogoTarjaAssinaturaCertificado.queue.length > 0">{{uploaderLogoTarjaAssinaturaCertificado.queue[0].file.name}}</span>
-								</div>
-							</div>
-							<input id="uploadLogoTarjaAssinaturaCertificado" type="file" nv-file-select="" uploader="uploaderLogoTarjaAssinaturaCertificado" ng-show="false" />
-						</div><!-- .form-group -->
-					</div>
-					<div class="row">
-						<div class="col-sm-12" ng-show="tarjaAssinatura.assinaturaCertificado.anexoImagem.anexo">
-							<img ng-src="data:image/JPEG;base64,{{tarjaAssinatura.assinaturaCertificado.anexoImagem.anexo}}" class="img-thumbnail" style="max-width: 300px; height: auto;">
-						</div>
-					</div>
-				</div>
-
-				<div class="row">
-					<div class="col-md-12">
-						<div class="form-group">
-							<label class="control-label block" ng-class="{'has-error': !tarjaAssinatura.assinaturaCertificado.conteudo && tarjaAssinaturaForm.$submitted}">
-								<translate>ECM.LABEL.CONTEUDO_HTML</translate> <span class="red">*</span>
-								<i ng-show="!tarjaAssinatura.assinaturaCertificado.conteudo && tarjaAssinaturaForm.$submitted" class='fa fa-warning red'
-									tooltip="{{$translate.instant('ECM.LABEL.CONTEUDO_HTML') + ' ' +$translate.instant('LABEL.CAMPO_OBRIGATORIO')}}"
-									tooltip-placement='top'></i>
-							</label>
-							<div id="tarjaAssinatura.assinaturaCertificado.conteudo" ckeditor="options" ng-if='edit' ready="onReady()" ng-model="tarjaAssinatura.assinaturaCertificado.conteudo" ></div>
-							<iframe id="visualizacaoConteudoTarjaAssinatura" srcdoc="{{tarjaAssinatura.assinaturaCertificado.conteudo}}"allowfullscreen class="iframe-report" ng-show="!edit" style="min-height: 100px !important;"></iframe>
+		<fieldset>
+			<legend>
+				<translate>ECM.LABEL.DADOS_TARJA_ASSINATURA</translate>
+			</legend>
+		</fieldset>
+		<p><small>( <span class="red">*</span> ) <translate>LABEL.CAMPOS_OBRIGATORIOS</translate></small></p>
+		<div class="row">
+			<div class="col-md-6">
+				<label-input ng-id="tarjaAssinatura.descricao" ng-label="LABEL.DESCRICAO" ng-type="text"
+					ng-model="tarjaAssinatura.descricao" form="tarjaAssinaturaForm" ng-obrigatorio="true"
+					ng-custom-maxlength="100" ng-type="text" ng-disabled="!edit" />
+			</div>
+			<div class="col-md-4">
+				<label-input ng-id="tarjaAssinatura.tipoAssinatura" ng-label="ECM.LABEL.TIPO_ASSINATURA" ng-type="text"
+							ng-disabled="true" ng-model="tarjaAssinatura.tipoAssinatura.descricao" form="tarjaAssinaturaForm"
+							ng-obrigatorio="false" ng-type="text" />
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-sm-12">
+				<div class="form-group" ng-disable="!edit">
+					<label class="control-label"><translate>ECM.LABEL.LOGO_TARJA_ASSINATURA</translate></label>
+					<div ng-if="tarjaAssinatura.anexoImagem.anexo == undefined" nv-file-drop="" uploader="uploaderLogo"
+						onclick="$('#uploadLogoTarjaAssinatura').click()">
+						<div nv-file-over="" uploader="uploaderLogo" over-class="another-file-over-class" class="well my-drop-zone">
+							<span ng-show="uploaderLogo.queue.length <= 0"><translate>MSG.ARRASTE_SOLTE_ARQUIVO</translate></span>
+							<span ng-show="uploaderLogo.queue.length > 0">{{uploaderLogo.queue[0].file.name}}</span>
 						</div>
 					</div>
+					<input id="uploadLogoTarjaAssinatura" type="file" nv-file-select="" uploader="uploaderLogo" ng-show="false" />
+				</div><!-- .form-group -->
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-sm-12" ng-show="tarjaAssinatura.anexoImagem.anexo">
+				<img ng-src="data:image/JPEG;base64,{{tarjaAssinatura.anexoImagem.anexo}}" class="img-thumbnail" style="max-width: 300px; height: auto;">
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-md-12">
+				<div class="form-group">
+					<label class="control-label block" ng-class="{'has-error': !tarjaAssinatura.conteudo && tarjaAssinaturaForm.$submitted}">
+						<translate>ECM.LABEL.CONTEUDO_HTML</translate> <span class="red">*</span>
+						<i ng-show="!tarjaAssinatura.conteudo && tarjaAssinaturaForm.$submitted" class='fa fa-warning red'
+							tooltip="{{$translate.instant('ECM.LABEL.CONTEUDO_HTML') + ' ' +$translate.instant('LABEL.CAMPO_OBRIGATORIO')}}"
+							tooltip-placement='top'></i>
+					</label>
+					<div id="tarjaAssinatura.conteudo" ckeditor="options" ng-if='edit' ready="onReady()" ng-model="tarjaAssinatura.conteudo" ></div>
+					<iframe id="visualizacaoConteudoTarjaAssinatura" srcdoc="{{tarjaAssinatura.conteudo}}"
+							allowfullscreen class="iframe-report" ng-show="!edit" style="min-height: 100px !important;"></iframe>
 				</div>
-		</tab>
-	</tabset>
+			</div>
+		</div>
 	</form>
 </div><!-- .page-content -->
diff --git a/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaList.html b/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaList.html
index b01569b..46a0219 100644
--- a/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaList.html
+++ b/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaList.html
@@ -2,11 +2,11 @@
 	<div class="bar-buttons-action fixed">
 		<div class="row">
 			<div class="col-sm-8 text-left">
-				<button class="btn btn-clear" ng-click="abrirVisualizar(false);">
+				<button class="btn btn-clear" ng-click="editarVisualizarTarjaAssinatura(false);">
 					<i class="fa fa-search blue"></i>
 					<translate>LABEL.VISUALIZAR</translate>
 				</button>
-				<button class="btn btn-clear" ng-click="abrirVisualizar(true);">
+				<button class="btn btn-clear" ng-click="editarVisualizarTarjaAssinatura(true);">
 					<i class="fa fa-pencil blue"></i>
 					<translate>LABEL.EDITAR</translate>
 				</button>
@@ -27,7 +27,6 @@
 
 	<breadcrumb ng-workspace="workspace"></breadcrumb>
 
-	<list-view ng-lista="tarjaAssinaturaList" ng-repository="TarjaAssinaturaRepository" ng-use-custom-remove="false" ng-headers="headers"
-				ng-filter-criteria="filterCriteria" ng-item-selecionado="tarjaAssinaturaChecked"></list-view>
-</div>
-<!-- .page-content -->
+	<list-view ng-lista="tarjaAssinaturaList" ng-repository="TarjaAssinaturaRepository" ng-use-custom-remove="false"
+				ng-headers="headers" ng-filter-criteria="filterCriteria" ng-item-selecionado="tarjaAssinaturaChecked"></list-view>
+</div><!-- .page-content -->
--
libgit2 0.21.2