diff --git a/public/modules/forms/admin/config/i18n/english.js b/public/modules/forms/admin/config/i18n/english.js
index fa778cd2..180d2fd0 100644
--- a/public/modules/forms/admin/config/i18n/english.js
+++ b/public/modules/forms/admin/config/i18n/english.js
@@ -137,11 +137,33 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid
 		BTN_BACKGROUND_COLOR: 'Button Background Color',
 		BTN_TEXT_COLOR: 'Button Text Color',
 
+    //Share View
+    EMBED_YOUR_FORM: 'Embed your form',
+    SHARE_YOUR_FORM: 'Share your form',
+
 		//Admin Tabs
 		CREATE_TAB: 'Create',
 		DESIGN_TAB: 'Design',
 		CONFIGURE_TAB: 'Configure',
-		ANALYZE_TAB: 'Analyze'
+		ANALYZE_TAB: 'Analyze',
+    SHARE_TAB: 'Share',
 
+    //Field Types
+    SHORT_TEXT: 'Short Text',
+    EMAIL: 'Email',
+    MULTIPLE_CHOICE: 'Multiple Choice',
+    DROPDOWN: 'Dropdown',
+    DATE: 'Date',
+    PARAGRAPH_T: 'Paragraph',
+    YES_NO: 'Yes/No',
+    LEGAL: 'Legal',
+    RATING: 'Rating',
+    NUMBERS: 'Numbers',
+    SIGNATURE: 'Signature',
+    FILE_UPLOAD: 'File upload',
+    OPTION_SCALE: 'Option Scale',
+    PAYMENT: 'Payment',
+    STATEMENT: 'Statement',
+    LINK: 'Link'
 	});
 }]);
diff --git a/public/modules/forms/admin/config/i18n/spanish.js b/public/modules/forms/admin/config/i18n/spanish.js
index 06dbd9ea..2094a2ee 100644
--- a/public/modules/forms/admin/config/i18n/spanish.js
+++ b/public/modules/forms/admin/config/i18n/spanish.js
@@ -137,11 +137,33 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid
 		BTN_BACKGROUND_COLOR: 'Color de fondo del botón',
 		BTN_TEXT_COLOR: 'Color del texto del botón',
 
+    //Share View
+    EMBED_YOUR_FORM: 'Pone tu formulario',
+    SHARE_YOUR_FORM: 'Compartí tu formulario',
+
 		//Admin Tabs
 		CREATE_TAB: 'Crear',
 		DESIGN_TAB: 'Diseño',
 		CONFIGURE_TAB: 'Configuración',
-		ANALYZE_TAB: 'Análisis'
+		ANALYZE_TAB: 'Análisis',
+    SHARE_TAB: 'Compartir',
 
+    //Field Types
+    SHORT_TEXT: 'Texto corto',
+    EMAIL: 'Email',
+    MULTIPLE_CHOICE: 'Opciones múltiples',
+    DROPDOWN: 'Desplegable',
+    DATE: 'Fecha',
+    PARAGRAPH_T: 'Párrafo',
+    YES_NO: 'Si/No',
+    LEGAL: 'Legal',
+    RATING: 'Puntaje',
+    NUMBERS: 'Números',
+    SIGNATURE: 'Firma',
+    FILE_UPLOAD: 'Subir archivo',
+    OPTION_SCALE: 'Escala',
+    PAYMENT: 'Pago',
+    STATEMENT: 'Declaración',
+    LINK: 'Enlace'
 	});
 }]);
diff --git a/public/modules/forms/admin/services/form-fields.client.service.js b/public/modules/forms/admin/services/form-fields.client.service.js
index a0ca0706..451f11ac 100644
--- a/public/modules/forms/admin/services/form-fields.client.service.js
+++ b/public/modules/forms/admin/services/form-fields.client.service.js
@@ -1,72 +1,72 @@
 'use strict';
 
 //TODO: DAVID: URGENT: Make this a $resource that fetches valid field types from server
-angular.module('forms').service('FormFields', [
-	function() {
+angular.module('forms').service('FormFields', [ '$filter',
+	function($filter) {
 		this.types = [
 		    {
 		        name : 'textfield',
-		        value : 'Short Text'
+		        value : $filter('translate')('SHORT_TEXT'),
 		    },
 		    {
 		        name : 'email',
-		        value : 'Email'
+		        value : $filter('translate')('EMAIL'),
 		    },
 		    {
 		        name : 'radio',
-		        value : 'Multiple Choice'
+		        value : $filter('translate')('MULTIPLE_CHOICE'),
 		    },
 		    {
 		        name : 'dropdown',
-		        value : 'Dropdown'
+		        value : $filter('translate')('DROPDOWN'),
 		    },
 		    {
 		        name : 'date',
-		        value : 'Date'
+		        value : $filter('translate')('DATE'),
 		    },
 		    {
 		        name : 'textarea',
-		        value : 'Paragraph Text'
+		        value : $filter('translate')('PARAGRAPH'),
 		    },
 		    {
 		        name : 'yes_no',
-		        value : 'Yes/No'
+		        value : $filter('translate')('YES_NO'),
 		    },
 		    {
 		        name : 'legal',
-		        value : 'Legal'
+		        value : $filter('translate')('LEGAL'),
 		    },
 		    // {
 		    //     name : 'sig',
-		    //     value : 'Signature'
+		    //     value : $filter('translate')('SIGNATURE'),
 		    // },
 			// {
 		    //     name : 'file',
-		    //     value : 'File Upload'
+		    //     value : $filter('translate')('FILE_UPLOAD'),
 		    // },
 		    {
 		        name : 'rating',
-		        value : 'Rating'
+		        value : $filter('translate')('RATING'),
 		    },
 		    {
 		        name : 'link',
-		        value : 'Link'
+		        value : $filter('translate')('LINK'),
 		    },
 		    {
 		        name : 'number',
-		        value : 'Numbers'
+		        value : $filter('translate')('NUMBERS'),
 		    },
 		    // {
 		    //     name : 'scale',
-		    //     value : 'Opinion Scale'
+		    //     value : $filter('translate')('OPINION SCALE'),
 		    // },
 		    // {
 		    //     name : 'stripe',
-		    //     value : 'Payment'
+		    //     value : $filter('translate')('PAYMENT'),
 		    // },
 		    {
 		        name : 'statement',
-		        value : 'Statement'
+		        value : $filter('translate')('STATEMENT')
 		    }
 		];
 	}
diff --git a/public/modules/forms/admin/services/submissions.client.service.js b/public/modules/forms/admin/services/submissions.client.service.js
index c7b3043c..4439732f 100644
--- a/public/modules/forms/admin/services/submissions.client.service.js
+++ b/public/modules/forms/admin/services/submissions.client.service.js
@@ -19,4 +19,4 @@ angular.module('forms').factory('Submissions', ['$resource',
 			}
 		});
 	}
-]);
\ No newline at end of file
+]);
diff --git a/public/modules/forms/admin/views/admin-form.client.view.html b/public/modules/forms/admin/views/admin-form.client.view.html
index c02111f4..c25805c1 100644
--- a/public/modules/forms/admin/views/admin-form.client.view.html
+++ b/public/modules/forms/admin/views/admin-form.client.view.html
@@ -67,12 +67,12 @@
 				<uib-tab ng-repeat="tab in tabData" index="{{$index}}+1" heading="{{tab.heading}}">
 					<div class='row' data-ng-include="'/static/modules/forms/admin/views/adminTabs/'+tab.templateName+'.html'" onload="form_url = trustSrc(formURL)"></div>
 				</uib-tab>
-				<uib-tab ng-if="tabData" heading="Share" index="{{tabData.length}}">
+				<uib-tab ng-if="tabData" heading="{{ 'SHARE_TAB' | translate }}" index="{{tabData.length}}">
 					<div class="config-form">
 						<div class="row">
 							<div class="col-sm-12">
 								<uib-tabset active="activePill" vertical="true" type="pills">
-									<uib-tab index="0" heading="Share your Form">
+									<uib-tab index="0" heading="{{ 'SHARE_YOUR_FORM' | translate }}">
 										<div class="row">
 											<div class="col-sm-12">
 												{{ 'TELLFORM_URL' | translate }}
@@ -87,7 +87,7 @@
 											</div>
 										</div>
 									</uib-tab>
-									<uib-tab index="1" heading="Embed your Form">
+									<uib-tab index="1" heading="{{ 'EMBED_YOUR_FORM' | translate }}">
 										<div class="row">
 											<div class="col-sm-12">
 												{{ 'COPY_AND_PASTE' | translate }}
@@ -113,7 +113,7 @@
 						</div>
 					</div>
 				</uib-tab>
-				<uib-tab ng-if="tabData && myform.form_fields.length" heading="Design" index="{{tabData.length}}+1">
+				<uib-tab ng-if="tabData && myform.form_fields.length" heading="{{ 'DESIGN_TAB' | translate }}" index="{{tabData.length}}+1">
 					<div class="config-form design container">
 						<div class="row">
 							<div class="col-md-4 col-sm-12 container">