diff --git a/core/modules/shortcut/shortcut.admin.inc b/core/modules/shortcut/shortcut.admin.inc
index 3345c59..986b75a 100644
--- a/core/modules/shortcut/shortcut.admin.inc
+++ b/core/modules/shortcut/shortcut.admin.inc
@@ -338,6 +338,36 @@ function theme_shortcut_set_customize($variables) {
 }
 
 /**
+ * Preprocess variables for theme('shortcut_set_customize').
+ *
+ * @see shortcut-set-customize.html.twig
+ */
+function template_preprocess_shortcut_set_customize(&$variables) {
+  $form = $variables['form'];
+
+  $rows = array();
+  drupal_add_tabledrag('shortcuts', 'order', 'sibling', 'shortcut-weight');
+  foreach (element_children($form['shortcuts']['links']) as $key) {
+    $shortcut = &$form['shortcuts']['links'][$key];
+    $row = array();
+    $row[] = drupal_render($shortcut['name']);
+    $row[] = drupal_render($shortcut['weight']);
+    $row[] = drupal_render($shortcut['edit']);
+    $row[] = drupal_render($shortcut['delete']);
+    $rows[] = array(
+      'data' => $row,
+      'class' => array('draggable'),
+    );
+  }
+
+  $header = array(t('Name'), t('Weight'), array('data' => t('Operations'), 'colspan' => 2));
+  $variables['actions'] = drupal_render($form['actions']);
+  $variables['form'] = drupal_render_children($form);
+  $variables['table'] = theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'shortcuts'), 'empty' => t('No shortcuts available. <a href="@link">Add a shortcut</a>.', array('@link' => url('admin/config/user-interface/shortcut/' . $form['#shortcut_set_name'] . '/add-link')))));
+  return $output;
+}
+
+/**
  * Form callback: builds the form for adding a new shortcut link.
  *
  * @param $form
@@ -694,4 +724,4 @@ function shortcut_link_add_inline($shortcut_set) {
   }
 
   throw new AccessDeniedHttpException();
-}
+}
diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module
index 27eb8c2..838379b 100644
--- a/core/modules/shortcut/shortcut.module
+++ b/core/modules/shortcut/shortcut.module
@@ -179,6 +179,7 @@ function shortcut_theme() {
     'shortcut_set_customize' => array(
       'render element' => 'form',
       'file' => 'shortcut.admin.inc',
+      'template' => 'shortcut-set-customize',
     ),
   );
 }
diff --git a/core/themes/stark/templates/shortcut/shortcut-set-customize.html.twig b/core/themes/stark/templates/shortcut/shortcut-set-customize.html.twig
new file mode 100644
index 0000000..8067af0
--- /dev/null
+++ b/core/themes/stark/templates/shortcut/shortcut-set-customize.html.twig
@@ -0,0 +1,19 @@
+{#
+/**
+ * @file
+ * Default theme implementation for shortcuts customization.
+ *
+ * Available variables:
+ * - form: A element representing the form.
+ * - table: A element representing user defined shortcuts.
+ * - actions: A element representing action of a form.
+ *
+ * @see template_preprocess
+ * @see template_preprocess_shortcut_set_customize
+ *
+ * @ingroup themeable
+ */
+#}
+{{ form }}
+{{ table }}
+{{ actions }}