diff --git a/core/modules/node/node.pages.inc b/core/modules/node/node.pages.inc
index 863babd..620c072 100644
--- a/core/modules/node/node.pages.inc
+++ b/core/modules/node/node.pages.inc
@@ -71,9 +71,17 @@ function theme_node_add_list($variables) {
   $output = '';
 
   if ($content) {
+    if (user_access('administer content types')) {
+      // Generate links to edit content type if the current user has proper permissions.
+      foreach ($content as $key => $item) {
+        $content[$key]->edit_href = 'admin/structure/types/manage/' . $item->type;
+      }
+    }
     $output = '<dl class="node-type-list">';
     foreach ($content as $type) {
-      $output .= '<dt>' . l($type->name, 'node/add/' . $type->type) . '</dt>';
+      $output .= '<dt>' . l($type->name, 'node/add/' . $type->type);
+      $output .= isset($type->edit_href) ? ' <span class="node-type-edit">[ ' . l(t('Edit content type'), $type->edit_href) . ' ]</span>' : '';
+      $output .= '</dt>';
       $output .= '<dd>' . filter_xss_admin($type->description) . '</dd>';
     }
     $output .= '</dl>';
diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css
index 72ce5e6..c60b985 100644
--- a/core/themes/seven/style.css
+++ b/core/themes/seven/style.css
@@ -1775,3 +1775,9 @@ details.fieldset-no-legend {
 .js .form-actions .dropbutton-multiple.open .dropbutton-action:hover {
   background-color: #50a0e9;
 }
+
+/* Add content page */
+.node-type-edit {
+  font-size: .8em;
+  margin-left: .5em;
+}
diff --git a/core/themes/seven/template.php b/core/themes/seven/template.php
index 147e557..783854a 100644
--- a/core/themes/seven/template.php
+++ b/core/themes/seven/template.php
@@ -45,10 +45,17 @@ function seven_node_add_list($variables) {
   $content = $variables['content'];
   $output = '';
   if ($content) {
+    if (user_access('administer content types')) {
+      // Generate links to edit content type if the current user has proper permissions.
+      foreach ($content as $key => $item) {
+        $content[$key]->edit_href = 'admin/structure/types/manage/'.$item->type;
+      }
+    }
     $output = '<ul class="admin-list">';
     foreach ($content as $type) {
       $output .= '<li class="clearfix">';
       $content = '<span class="label">' . check_plain($type->name) . '</span>';
+      $content .= isset($type->edit_href) ? '<span class="label">' . l(t('Edit content type'), $type->edit_href) . '</span>' : '';
       $content .= '<div class="description">' . filter_xss_admin($type->description) . '</div>';
       $options['html'] = TRUE;
       $output .= l($content, 'node/add/' . $type->type, $options);