diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index dad2677a40..750e80868d 100644
--- a/wp-admin/themes.php
+++ b/wp-admin/themes.php
@@ -102,12 +102,12 @@ function theme_update_available( $theme ) {
 <div class="wrap">
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
-<h2><?php _e('Current Theme'); ?></h2>
+<h3><?php _e('Current Theme'); ?></h3>
 <div id="current-theme">
 <?php if ( $ct->screenshot ) : ?>
 <img src="<?php echo WP_CONTENT_URL . $ct->stylesheet_dir . '/' . $ct->screenshot; ?>" alt="<?php _e('Current theme preview'); ?>" />
 <?php endif; ?>
-<h3><?php printf(_c('%1$s %2$s by %3$s|1: theme title, 2: theme version, 3: theme author'), $ct->title, $ct->version, $ct->author) ; ?></h3>
+<h4><?php printf(_c('%1$s %2$s by %3$s|1: theme title, 2: theme version, 3: theme author'), $ct->title, $ct->version, $ct->author) ; ?></h4>
 <p class="description"><?php echo $ct->description; ?></p>
 <?php if ($ct->parent_theme) { ?>
 	<p><?php printf(__('The template files are located in <code>%2$s</code>.  The stylesheet files are located in <code>%3$s</code>.  <strong>%4$s</strong> uses templates from <strong>%5$s</strong>.  Changes made to the templates will affect both themes.'), $ct->title, $ct->template_dir, $ct->stylesheet_dir, $ct->title, $ct->parent_theme); ?></p>
@@ -121,8 +121,8 @@ function theme_update_available( $theme ) {
 
 </div>
 
-<h2><?php _e('Available Themes'); ?></h2>
-<br class="clear" />
+<h3><?php _e('Available Themes'); ?></h3>
+<div class="clear"></div>
 
 <?php if ( $page_links ) : ?>
 <div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>' . __( '%s' ),
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index b3d424de8c..9221621098 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -64,6 +64,7 @@ table#availablethemes {
 	border-top: 1px solid #ccc;
 	border-bottom: 1px solid #ccc;
 	margin: 10px auto;
+	width: 100%;
 }
 
 td.available-theme {
@@ -111,7 +112,7 @@ table#availablethemes td.bottom {
 }
 
 #current-theme {
-	margin-top: 1em;
+	margin: 1em 0 1.5em;
 }
 
 #current-theme a {
@@ -3011,3 +3012,8 @@ form.upgrade {
 #flash-upload-ui {
 	padding: 20px 12px 0;
 }
+
+br.clear {
+	height: 2px;
+	line-height: 2px;
+}