Index: wp-admin/plugins.php
===================================================================
--- wp-admin/plugins.php	(revision 6603)
+++ wp-admin/plugins.php	(working copy)
@@ -81,9 +81,8 @@
 	<thead>
 	<tr>
 		<th><?php _e('Plugin'); ?></th>
-		<th style="text-align: center"><?php _e('Version'); ?></th>
 		<th><?php _e('Description'); ?></th>
-		<th style="text-align: center"<?php if ( current_user_can('edit_plugins') ) echo ' colspan="2"'; ?>><?php _e('Action'); ?></th>
+		<th style="text-align: center"><?php _e('Actions'); ?></th>
 	</tr>
 	</thead>
 <?php
@@ -91,13 +90,14 @@
 
 	foreach($plugins as $plugin_file => $plugin_data) {
 		$style = ('class="alternate"' == $style|| 'class="alternate active"' == $style) ? '' : 'alternate';
-
+		$actions = array();
+		
 		if (!empty($current_plugins) && in_array($plugin_file, $current_plugins)) {
-			$toggle = "<a href='" . wp_nonce_url("plugins.php?action=deactivate&amp;plugin=$plugin_file", 'deactivate-plugin_' . $plugin_file) . "' title='".__('Deactivate this plugin')."' class='delete'>".__('Deactivate')."</a>";
+			$actions[] = '<a href="' . wp_nonce_url("plugins.php?action=deactivate&amp;plugin=$plugin_file", 'deactivate-plugin_' . $plugin_file) . '" title="'.__('Deactivate this plugin').'" class="delete">'.__('Deactivate').'</a>';
 			$plugin_data['Title'] = "<strong>{$plugin_data['Title']}</strong>";
 			$style .= $style == 'alternate' ? ' active' : 'active';
 		} else {
-			$toggle = "<a href='" . wp_nonce_url("plugins.php?action=activate&amp;plugin=$plugin_file", 'activate-plugin_' . $plugin_file) . "' title='".__('Activate this plugin')."' class='edit'>".__('Activate')."</a>";
+			$actions[] = '<a href="' . wp_nonce_url("plugins.php?action=activate&amp;plugin=$plugin_file", 'activate-plugin_' . $plugin_file) . '" title="'.__('Activate this plugin').'" class="edit">'.__('Activate').'</a>';
 		}
 
 		$plugins_allowedtags = array('a' => array('href' => array(),'title' => array()),'abbr' => array('title' => array()),'acronym' => array('title' => array()),'code' => array(),'em' => array(),'strong' => array());
@@ -111,30 +111,27 @@
 		if ( $style != '' )
 			$style = 'class="' . $style . '"';
 		if ( is_writable(ABSPATH . PLUGINDIR . '/' . $plugin_file) )
-			$edit = "<a href='plugin-editor.php?file=$plugin_file' title='".__('Open this file in the Plugin Editor')."' class='edit'>".__('Edit')."</a>";
-		else
-			$edit = '';
+			$actions[] = "<a href='plugin-editor.php?file=$plugin_file' title='".__('Open this file in the Plugin Editor')."' class='edit'>".__('Edit')."</a>";
 
 		$author = ( empty($plugin_data['Author']) ) ? '' :  ' <cite>' . sprintf( __('By %s'), $plugin_data['Author'] ) . '.</cite>';
 
+		$actions = apply_filters('plugin_row_actions', $actions, $plugin_file);
+
 		echo "
 	<tr $style>
-		<td class='name'>{$plugin_data['Title']}</td>
-		<td class='vers'>{$plugin_data['Version']}</td>
+		<td class='name'>{$plugin_data['Title']} <span class='vers'>{$plugin_data['Version']}</span></td>
 		<td class='desc'><p>{$plugin_data['Description']}$author</p></td>
-		<td class='togl'>$toggle</td>";
-		if ( current_user_can('edit_plugins') )
-		echo "
-		<td>$edit</td>";
-		echo"
+		<td class='actions'>";
+		echo implode(' | ', $actions);
+		echo "</td>
 	</tr>";
 	do_action( 'after_plugin_row', $plugin_file );
 	}
 ?>
 
 <tr>
-	<td colspan="3">&nbsp;</td>
-	<td colspan="2" style="width:12em;">
+	<td colspan="2">&nbsp;</td>
+	<td style="width:12em; text-align:center;">
 	<?php 
 	$active = get_option('active_plugins');
 	$inactive = get_option('deactivated_plugins');
@@ -148,6 +145,7 @@
 	<?php
 	} // endif active/inactive plugin check
 	?>
+	</td>
 </tr>
 
 </table>
Index: wp-admin/wp-admin.css
===================================================================
--- wp-admin/wp-admin.css	(revision 6603)
+++ wp-admin/wp-admin.css	(working copy)
@@ -54,6 +54,10 @@
 	font-size: 16px;
 }
 
+.plugins a.edit, .plugins  a.delete, .plugins  a.view:hover, .plugins  a.edit:hover, .plugins a.delete:hover{
+	display: inline;
+}
+
 .import-system {
 	font-size: 16px;
 }
@@ -345,8 +349,13 @@
 
 table .vers {
 	text-align: center;
+	color:#666666;
 }
 
+table .actions{
+	font-weight: bold;
+}
+
 textarea.all-options, input.all-options {
 	width: 250px;
 }
@@ -561,8 +570,6 @@
 	font-size: 15px;
 }
 
-.plugins p {
-}
 
 #login .fullwidth {
 	width: 320px;