diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
index 0aa0a86ed4..bcf8fdb004 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
@@ -5,13 +5,15 @@
         <a prevent-default href="" title="Remove this text box"
             ng-show="model.value.length > model.config.min"
             ng-click="remove($index)">
-            <i class="icon icon-minus"></i>
+            <i class="icon icon-remove"></i>
         </a>
     </div>
     <a prevent-default href="" title="Add another text box"
         ng-show="model.config.max <= 0 || model.value.length < model.config.max"
         ng-click="add()">
-        <i class="icon icon-plus"></i>
+        <i class="icon icon-add"></i>
     </a>
     
+    {{model | json}}
+
 </div>
diff --git a/src/Umbraco.Web/PropertyEditors/MultipleTextStringPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MultipleTextStringPropertyEditor.cs
index 1f2cfe55fe..cc6c0468a3 100644
--- a/src/Umbraco.Web/PropertyEditors/MultipleTextStringPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultipleTextStringPropertyEditor.cs
@@ -44,7 +44,7 @@ namespace Umbraco.Web.PropertyEditors
                 });
                 Fields.Add(new PreValueField(new IntegerValidator())
                 {
-                    Description = "Enter the maximum amount of text boxes to be displayed, enter -1 for unlimited",
+                    Description = "Enter the maximum amount of text boxes to be displayed, enter 0 for unlimited",
                     Key = "max",
                     View = "requiredfield",
                     Name = "Maximum"
@@ -153,8 +153,13 @@ namespace Umbraco.Web.PropertyEditors
                                    .Where(x => x["value"] != null)
                                    .Select(x => x["value"].Value<string>());
                 
-                //only allow the max
-                return string.Join(Environment.NewLine, array.Take(max));
+                //only allow the max if over 0
+                if (max > 0)
+                {
+                    return string.Join(Environment.NewLine, array.Take(max));    
+                }
+                
+                return string.Join(Environment.NewLine, array);
             }
 
             /// <summary>