diff --git a/core/lib/Thelia/Form/CategoryCreationForm.php b/core/lib/Thelia/Form/CategoryCreationForm.php
index 9935eec19..a125ad090 100755
--- a/core/lib/Thelia/Form/CategoryCreationForm.php
+++ b/core/lib/Thelia/Form/CategoryCreationForm.php
@@ -32,6 +32,10 @@ class CategoryCreationForm extends BaseForm
             ->add("title", "text", array(
                 "constraints" => array(
                     new NotBlank()
+                ),
+                "label" => "Category title *",
+                "label_attr" => array(
+                    "for" => "title"
                 )
             ))
             ->add("parent", "integer", array(
diff --git a/templates/admin/default/categories.html b/templates/admin/default/categories.html
index 49db025ae..1de7db1c2 100755
--- a/templates/admin/default/categories.html
+++ b/templates/admin/default/categories.html
@@ -261,7 +261,7 @@
 						{elseloop rel="product_list"}
 						<thead>
 							<tr>
-								<td class="message"><div class="alert alert-info">{intl l="This category doesn't have any products. To add a new product, click the + button above."}</div></td>
+								<td class="message"><div class="alert alert-info">{intl l="This category doesn't have any products. To add a new product, <strong>click the + button</strong> above."}</div></td>
 							</tr>
 						</thead>
 						{/elseloop}
@@ -288,68 +288,68 @@
 	    <script src="{$asset_url}"></script>
 	{/javascripts}
 
-<script>
-$(function() {
+	<script>
+		$(function() {
 
-	{* display the form creation dialog if it contains errors *}
+			{* display the form creation dialog if it contains errors *}
 
-    {form name="thelia.admin.category.creation"}
-        {if #form_error}
-			$('#add_category_dialog').modal();
-        {/if}
-	{/form}
+		    {form name="thelia.admin.category.creation"}
+		        {if #form_error}
+					$('#add_category_dialog').modal();
+		        {/if}
+			{/form}
 
-	{* Always reset create dialog on close *}
+			{* Always reset create dialog on close *}
 
-    $('#add_category_dialog').on('hidden',function() {
-        // Hide error message
-        $('#add_category_dialog_error').remove();
+		    $('#add_category_dialog').on('hidden',function() {
+		        // Hide error message
+		        $('#add_category_dialog_error').remove();
 
-        // Clear error status
-        $("#add_category_dialog .error").removeClass('error');
+		        // Clear error status
+		        $("#add_category_dialog .error").removeClass('error');
 
-        // Empty field values
-        $("#add_category_dialog input[type=text]").val('');
-    });
+		        // Empty field values
+		        $("#add_category_dialog input[type=text]").val('');
+		    });
 
-    {* Set the proper category ID in the delete confirmation dialog *}
+		    {* Set the proper category ID in the delete confirmation dialog *}
 
-    $(document).on("click", ".category-delete", function () {
-    	$('#'+'delete-category-id').val($(this).data('id'));
-    });
+		    $(document).on("click", ".category-delete", function () {
+		    	$('#'+'delete-category-id').val($(this).data('id'));
+		    });
 
-    // Toggle category visibility
-    $(".categoryVisibleToggle").click(function() {
-        $.ajax({
-           url : "{url path='admin/catalog/category'}",
-           data : {
-               category_id : $(this).data('id'),
-               action : 'visibilityToggle'
-           }
-        });
-    });
+		    // Toggle category visibility
+		    $(".categoryVisibleToggle").change(function() {
+		        $.ajax({
+		           url : "{url path='admin/catalog/category'}",
+		           data : {
+		               category_id : $(this).data('id'),
+		               action : 'visibilityToggle'
+		           }
+		        });
+		    });
 
-    {* Inline editing of object position using bootstrap-editable *}
+		    {* Inline editing of object position using bootstrap-editable *}
 
-    $('.categoryPositionChange').editable({
-        type        : 'text',
-        title       : '{intl l="Enter new category position"}',
-        mode        : 'popup',
-        inputclass  : 'input-mini',
-        placement   : 'left',
-        success     : function(response, newValue) {
-        	// The URL template
-        	var url = "{url path='admin/catalog/category' action='changePosition' category_id='__ID__' position='__POS__'}";
+		    $('.categoryPositionChange').editable({
+		        type        : 'text',
+		        title       : '{intl l="Enter new category position"}',
+		        mode        : 'popup',
+		        inputclass  : 'input-mini',
+		        placement   : 'left',
+		        success     : function(response, newValue) {
+		        	// The URL template
+		        	var url = "{url path='admin/catalog/category' action='changePosition' category_id='__ID__' position='__POS__'}";
 
-        	// Perform subtitutions
-            url = url.replace('__ID__', $(this).data('id'))
-                     .replace('__POS__', newValue);
+		        	// Perform subtitutions
+		            url = url.replace('__ID__', $(this).data('id'))
+		                     .replace('__POS__', newValue);
 
-        	// Reload the page
-        	location.href = url;
-        }
-    });
+		        	// Reload the page
+		        	location.href = url;
+		        }
+		    });
 
-})
-</script>
+		});
+	</script>
 {/block}
\ No newline at end of file
diff --git a/templates/admin/default/includes/add-category-dialog.html b/templates/admin/default/includes/add-category-dialog.html
index 0e62994f7..631d0c06e 100755
--- a/templates/admin/default/includes/add-category-dialog.html
+++ b/templates/admin/default/includes/add-category-dialog.html
@@ -30,36 +30,35 @@
 
 			    <div class="modal-body">
 
-		            {if #form_error}<div class="alert alert-block alert-error" id="add_category_dialog_error">#form_error_message</div>{/if}
+		            {if #form_error}<div class="alert alert-error" id="add_category_dialog_error">#form_error_message</div>{/if}
+					
+					{form_field form=$form field='title'}
+				        <div class="form-group {if $error}has-error{/if}">
+				            <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+				            
+		                    {loop type="lang" name="default-lang" default_only="1"}
+		                        
+			                    <div class="input-group">
+			                        <input type="text" id="{$label_attr.for}" required="required" name="{$name}" value="{$value}" title="{intl l='Category title'}" placeholder="{intl l='Category title'}" class="form-control">
+			                        <span class="input-group-addon"><img src="{image file="../assets/img/flags/{$CODE}.gif"}" alt="{intl l=$TITLE}" /></span>
+			                    </div>
 
-			        <div class="form-group">
-			            <label class="control-label">
-			               {intl l='Category Title *'}
-			            </label>
-			            
-	                    {loop type="lang" name="default-lang" default_only="1"}
-	                        {form_field form=$form field='locale'}
-	                        <input type="hidden" name="{$name}" value="{$LOCALE}" />
-	                        {/form_field}
+				                <div class="help-block">{intl l="Enter here the category title in the default language ($TITLE)"}</div>
 
-		                    <div class="input-group input-block-level">
-		                        {form_field form=$form field='title'}
-		                        <span {if $error}class="error"{/if}>
-		                           <input type="text" required="required" name="{$name}" value="{$value}" title="{intl l='Category title'}" placeholder="{intl l='Category title'}" class="form-control input-block-level">
-		                        </span>
+				                {form_field form=$form field='locale'}
+		                        <input type="hidden" name="{$name}" value="{$LOCALE}" />
 		                        {/form_field}
-		                        <span class="input-group-addon"><img src="{image file="../assets/img/flags/{$CODE}.gif"}" alt="{intl l=$TITLE}" /></span>
-		                    </div>
 
-			                <div class="help-block">{intl l="Enter here the category title in the default language ($TITLE)"}</div>
-		                {/loop}
-			            
-			        </div>
+			                {/loop}
+				            
+				        </div>
+			        {/form_field}
+
 			    </div>
 
 			    <div class="modal-footer">
-			        <button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true">{intl l="Cancel"}</button>
-			        <button type="submit" class="btn btn-default btn-primary">{intl l="Create this category"}</button>
+			        <button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true"><span class="glyphicon glyphicon-remove"></span> {intl l="Cancel"}</button>
+			        <button type="submit" class="btn btn-default btn-primary"><span class="glyphicon glyphicon-check"></span> {intl l="Create this category"}</button>
 			    </div>
 
 		    </form>