diff --git a/cms/templates/base.html b/cms/templates/base.html
index 5fa347b6bf..e0e3e94d26 100644
--- a/cms/templates/base.html
+++ b/cms/templates/base.html
@@ -20,8 +20,6 @@
     <%static:css group='base-style'/>
     <link rel="stylesheet" type="text/css" href="${static.url('js/vendor/markitup/skins/simple/style.css')}" />
     <link rel="stylesheet" type="text/css" href="${static.url('js/vendor/markitup/sets/wiki/style.css')}" />
-    <link rel="stylesheet" type="text/css" href="${static.url('css/vendor/symbolset.ss-symbolicons-block.css')}" />
-    <link rel="stylesheet" type="text/css" href="${static.url('css/vendor/symbolset.ss-standard.css')}" />
 
     <%include file="widgets/segment-io.html" />
 
@@ -43,8 +41,6 @@
     <script type="text/javascript" src="${static.url('js/vendor/backbone-min.js')}"></script>
     <script type="text/javascript" src="${static.url('js/vendor/markitup/jquery.markitup.js')}"></script>
     <script type="text/javascript" src="${static.url('js/vendor/markitup/sets/wiki/set.js')}"></script>
-    <script src="${static.url('js/vendor/symbolset.ss-standard.js')}"></script>
-    <script src="${static.url('js/vendor/symbolset.ss-symbolicons.js')}"></script>
 
     <%static:js group='main'/>
     <%static:js group='module-js'/>
diff --git a/common/lib/xmodule/xmodule/templates/word_cloud/default.yaml b/common/lib/xmodule/xmodule/templates/word_cloud/default.yaml
index 7f1c838ca9..53e9eeaae4 100644
--- a/common/lib/xmodule/xmodule/templates/word_cloud/default.yaml
+++ b/common/lib/xmodule/xmodule/templates/word_cloud/default.yaml
@@ -1,9 +1,5 @@
 ---
 metadata:
     display_name: Word cloud
-    version: 1
-    num_inputs: 5
-    num_top_words: 250
-    display_student_percents: True
 data: {}
 children: []
diff --git a/common/lib/xmodule/xmodule/word_cloud_module.py b/common/lib/xmodule/xmodule/word_cloud_module.py
index 440da8b887..c1f0db8c50 100644
--- a/common/lib/xmodule/xmodule/word_cloud_module.py
+++ b/common/lib/xmodule/xmodule/word_cloud_module.py
@@ -14,7 +14,8 @@ from xmodule.raw_module import RawDescriptor
 from xmodule.editing_module import MetadataOnlyEditingDescriptor
 from xmodule.x_module import XModule
 
-from xblock.core import Scope, String, Object, Boolean, List, Integer
+from xblock.core import Scope, Object, Boolean, List
+from fields import StringyBoolean, StringyInteger
 
 log = logging.getLogger(__name__)
 
@@ -31,21 +32,22 @@ def pretty_bool(value):
 
 class WordCloudFields(object):
     """XFields for word cloud."""
-    display_name = String(
-        help="Display name for this module",
-        scope=Scope.settings
-    )
-    num_inputs = Integer(
+    num_inputs = StringyInteger(
+        display_name="Inputs",
         help="Number of inputs.",
         scope=Scope.settings,
-        default=5
+        default=5,
+        values = {"min" : 1 }
     )
-    num_top_words = Integer(
+    num_top_words = StringyInteger(
+        display_name="Maximum Words",
         help="Number of max words, which will be displayed.",
         scope=Scope.settings,
-        default=250
+        default=250,
+        values = {"min" : 1 }
     )
-    display_student_percents = Boolean(
+    display_student_percents = StringyBoolean(
+        display_name="Show Usage",
         help="Display usage percents for each word?",
         scope=Scope.settings,
         default=True