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..e8bd700 100644
--- a/core/themes/seven/style.css
+++ b/core/themes/seven/style.css
@@ -394,7 +394,7 @@ ul.inline li {
   margin: 0;
   list-style-type: none;
   list-style-image: none;
-  padding: 0;
+  padding: 10px 0px;
 }
 .admin-list.compact li {
   border: none;
@@ -1775,3 +1775,22 @@ details.fieldset-no-legend {
 .js .form-actions .dropbutton-multiple.open .dropbutton-action:hover {
   background-color: #50a0e9;
 }
+
+/* Add content page */
+.admin-list li a.node-type-edit {
+  background: none;
+  padding : 0px;
+}
+.admin-list li a.node-type-edit:hover {
+  text-decoration: underline;
+}
+.admin-list li a.node-type-inline-link {
+  display: inline;
+}
+div.node-type-description {
+  margin: 5px 0;
+  line-height: 1.231em;
+  font-size: 0.923em;
+  color: #666;
+  padding: 0px 38px 0px;
+}
\ No newline at end of file
diff --git a/core/themes/seven/template.php b/core/themes/seven/template.php
index 147e557..be689aa 100644
--- a/core/themes/seven/template.php
+++ b/core/themes/seven/template.php
@@ -45,12 +45,20 @@ 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 .= '<div class="description">' . filter_xss_admin($type->description) . '</div>';
+      $content .= isset($type->edit_href) ? l(t('[ Edit content type ]'), $type->edit_href, array('attributes' => array('class' => 'node-type-edit node-type-inline-link' ))) : '';
+      $content .= '<div class="node-type-description">' . filter_xss_admin($type->description) . '</div>';
       $options['html'] = TRUE;
+      $options['attributes'] = array('class' => 'node-type-inline-link');
       $output .= l($content, 'node/add/' . $type->type, $options);
       $output .= '</li>';
     }