diff --git a/modules/book/book.admin.inc b/modules/book/book.admin.inc
index 7a319430a0b04eee2ff9af6f01cb40290e470025..02a45b24c8c2066b8bcf06e1a979512f0e1baf4d 100644
--- a/modules/book/book.admin.inc
+++ b/modules/book/book.admin.inc
@@ -246,8 +246,8 @@ function theme_book_admin_table($variables) {
       drupal_render($form[$key]['weight']),
       drupal_render($form[$key]['plid']) . drupal_render($form[$key]['mlid']),
       l(t('view'), $href),
-      $access ? l(t('edit'), 'node/' . $nid . '/edit', array('query' => $destination)) : '&nbsp',
-      $access ? l(t('delete'), 'node/' . $nid . '/delete', array('query' => $destination) )  : '&nbsp',
+      $access ? l(t('edit'), 'node/' . $nid . '/edit', array('query' => $destination)) : ' ',
+      $access ? l(t('delete'), 'node/' . $nid . '/delete', array('query' => $destination) )  : ' ',
     );
     $row = array('data' => $data);
     if (isset($form[$key]['#attributes'])) {
diff --git a/modules/node/content_types.inc b/modules/node/content_types.inc
index be7de61f29369936d46020dadc2c0daa85c46389..f3f7acfeab710ddd442a2b0f459d2ff3fc1845c1 100644
--- a/modules/node/content_types.inc
+++ b/modules/node/content_types.inc
@@ -94,7 +94,7 @@ function node_type_form($form, &$form_state, $type = NULL) {
     '#description' => t('The human-readable name of this content type. This text will be displayed as part of the list on the <em>Add new content</em> page. It is recommended that this name begin with a capital letter and contain only letters, numbers, and spaces. This name must be unique.'),
     '#required' => TRUE,
     '#size' => 30,
-    '#field_suffix' => ' <small id="edit-name-suffix">' . ($type->locked ? t('Machine name: @name', array('@name' => $type->type)) : '&nbsp') . '</small>',
+    '#field_suffix' => ' <small id="edit-name-suffix">' . ($type->locked ? t('Machine name: @name', array('@name' => $type->type)) : '&nbsp;') . '</small>',
   );
 
   if (!$type->locked) {
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 5f98fa3c2c18ab16f14e0b95ff47e7f63906701d..149b0819c06a1b405128bd8a39a0ea25beb21d25 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -2017,7 +2017,7 @@ function system_add_date_format_type_form($form, &$form_state) {
     '#title' => t('Date type'),
     '#type' => 'textfield',
     '#required' => TRUE,
-    '#field_suffix' => ' <small id="edit-date-type-suffix">&nbsp</small>',
+    '#field_suffix' => ' <small id="edit-date-type-suffix">&nbsp;</small>',
   );
   $js_settings = array(
     'type' => 'setting',
diff --git a/modules/taxonomy/taxonomy.admin.inc b/modules/taxonomy/taxonomy.admin.inc
index 5cdc22b51e581c4974e50ff4a496ac038e1d35aa..e1dfdec2f36216a8768f0461cf1a9c2b8e3ffd40 100644
--- a/modules/taxonomy/taxonomy.admin.inc
+++ b/modules/taxonomy/taxonomy.admin.inc
@@ -121,7 +121,7 @@ function taxonomy_form_vocabulary($form, &$form_state, $edit = array()) {
     '#default_value' => $edit['name'],
     '#maxlength' => 255,
     '#required' => TRUE,
-    '#field_suffix' => ' <small id="edit-name-suffix">&nbsp</small>',
+    '#field_suffix' => ' <small id="edit-name-suffix">&nbsp;</small>',
   );
   $js_settings = array(
     'type' => 'setting',