Index: src/wp-admin/themes.php
===================================================================
--- src/wp-admin/themes.php	(revision 30687)
+++ src/wp-admin/themes.php	(working copy)
@@ -165,14 +165,27 @@
 					$current_theme_actions[] = "<a class='button button-secondary' href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>";
 				else
 					$current_theme_actions[] = "<a class='button button-secondary' href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>";
-			} else if ( current_user_can($item[1]) ) {
-				$menu_file = $item[2];
-				if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
-					$menu_file = substr( $menu_file, 0, $pos );
-				if ( file_exists( ABSPATH . "wp-admin/$menu_file" ) ) {
-					$current_theme_actions[] = "<a class='button button-secondary' href='{$item[2]}'$class>{$item[0]}</a>";
-				} else {
-					$current_theme_actions[] = "<a class='button button-secondary' href='themes.php?page={$item[2]}'$class>{$item[0]}</a>";
+			} elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
+				switch( $item[2] ) {
+					case 'custom-header' :
+						$current_theme_actions[] = "<a class='button button-secondary' href='customize.php?autofocus[control]=header_image' $class>{$item[0]}</a>";
+						break;
+					case 'custom-background' :
+						$current_theme_actions[] = "<a class='button button-secondary' href='customize.php?autofocus[control]=background_image' $class>{$item[0]}</a>";
+						break;
+					default :
+						$menu_file = $item[2];
+
+						if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) {
+							$menu_file = substr( $menu_file, 0, $pos );
+						}
+
+						if ( file_exists( ABSPATH . "wp-admin/$menu_file" ) ) {
+							$current_theme_actions[] = "<a class='button button-secondary' href='{$item[2]}'$class>{$item[0]}</a>";
+						} else {
+							$current_theme_actions[] = "<a class='button button-secondary' href='themes.php?page={$item[2]}'$class>{$item[0]}</a>";
+						}
+						break;
 				}
 			}
 		}