diff --git a/ui/css/main.css b/ui/css/main.css
index a5f36c50c26..af32059eac4 100644
--- a/ui/css/main.css
+++ b/ui/css/main.css
@@ -2246,16 +2246,16 @@ a:hover.search_button {
 	font-weight:normal;
 	text-decoration:none;
 	float:left;
-	margin:7px 11px 0 5px;
-	padding:0;
+	margin:7px 0 0 3px;
+	padding:0 5px 0 0;
 }
 
 
 .actionpanel_button_icons {
-	width:25px;
+	width:22px;
 	height:18px;
 	float:left;
-	margin:5px 0 0 7px;
+	margin:5px 0 0 5px;
 	padding:0;
 }
 
diff --git a/ui/images/addvm_actionicon.png b/ui/images/addvm_actionicon.png
index abd2ad1bcac..786a5350885 100644
Binary files a/ui/images/addvm_actionicon.png and b/ui/images/addvm_actionicon.png differ
diff --git a/ui/images/destroyvm_actionicon.png b/ui/images/destroyvm_actionicon.png
index cdaed12e188..6e3bb89516b 100644
Binary files a/ui/images/destroyvm_actionicon.png and b/ui/images/destroyvm_actionicon.png differ
diff --git a/ui/images/rebootvm_actionicon.png b/ui/images/rebootvm_actionicon.png
index 3d48ed238f1..336b517f59d 100644
Binary files a/ui/images/rebootvm_actionicon.png and b/ui/images/rebootvm_actionicon.png differ
diff --git a/ui/images/refresh_actionicon.png b/ui/images/refresh_actionicon.png
index ad2c4f37465..a76f1921ed6 100644
Binary files a/ui/images/refresh_actionicon.png and b/ui/images/refresh_actionicon.png differ
diff --git a/ui/images/startvm_actionicon.png b/ui/images/startvm_actionicon.png
index efd66f5a23f..1a5e5d6aa54 100644
Binary files a/ui/images/startvm_actionicon.png and b/ui/images/startvm_actionicon.png differ
diff --git a/ui/images/stopvm_actionicon.png b/ui/images/stopvm_actionicon.png
index 7ea70cde830..d9b90690a2e 100644
Binary files a/ui/images/stopvm_actionicon.png and b/ui/images/stopvm_actionicon.png differ
diff --git a/ui/jsp/ipaddress.jsp b/ui/jsp/ipaddress.jsp
index 55b6f8ef979..da784b71f61 100644
--- a/ui/jsp/ipaddress.jsp
+++ b/ui/jsp/ipaddress.jsp
@@ -194,41 +194,41 @@
         <div id="tab_container">
 	        <div class="grid_container" id="grid_container">
 	            <div class="grid_header">
-	                <div class="grid_header_cell" style="width: 15%; padding: 1px;">
+	                <div class="grid_header_cell" style="width: 15%;">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.public.port"/></div>
 	                </div>
-	                <div class="grid_header_cell" style="width: 15%; padding: 1px;">
+	                <div class="grid_header_cell" style="width: 15%;">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.private.port"/></div>
 	                </div>
-	                <div class="grid_header_cell" style="width: 15%; padding: 1px;">
+	                <div class="grid_header_cell" style="width: 15%;">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.protocol"/></div>
 	                </div>
-	                <div class="grid_header_cell" style="width: 25%; border: none; padding: 1px;">
+	                <div class="grid_header_cell" style="width: 25%; border: none;">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.instance"/></div>
 	                </div>
-	                <div class="grid_header_cell" style="width: 10%; padding: 1px;">
+	                <div class="grid_header_cell" style="width: 10%;">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.state"/></div>
 	                </div>
-	                <div class="grid_header_cell" style="width: 15%; padding: 1px;">
+	                <div class="grid_header_cell" style="width: 15%;">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.actions"/></div>
 	                </div>
 	            </div>
 	            <div class="grid_rows even" id="create_port_forwarding_row">
-	                <div class="grid_row_cell" style="width: 15%; padding: 1px;">
+	                <div class="grid_row_cell" style="width: 15%;">
 	                    <input id="public_port" class="text" style="width: 70%;" type="text" />
 	                    <div id="public_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>
 	                </div>
-	                <div class="grid_row_cell" style="width: 15%; padding: 1px;">
+	                <div class="grid_row_cell" style="width: 15%;">
 	                    <input id="private_port" class="text" style="width: 70%;" type="text" />
 	                    <div id="private_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>
 	                </div>
-	                <div class="grid_row_cell" style="width: 15%; padding: 1px;">  
+	                <div class="grid_row_cell" style="width: 15%;">  
 	                   <select class="select" id="protocol" style="width:70%;">
 	                       <!--  
 	                       <option value="TCP">TCP</option>
@@ -236,15 +236,15 @@
 	                       -->
 	                   </select>
 	                </div>
-	                <div class="grid_row_cell" style="width: 25%; padding: 1px;">                   
+	                <div class="grid_row_cell" style="width: 25%;">                   
 	                    <select class="select" id="vm">
 	                    </select>
 	                    <div id="vm_errormsg" class="errormsg" style="display: none;"></div>	                    
 	                </div>
-	                <div class="grid_row_cell" style="width: 10%; padding: 1px;">   
+	                <div class="grid_row_cell" style="width: 10%;">   
 	                    <div class="row_celltitles" id="state"></div>
 	                </div>  
-	                <div class="grid_row_cell" style="width: 15%; padding: 1px;">
+	                <div class="grid_row_cell" style="width: 15%;">
 	                    <div class="row_celltitles">
 	                        <a id="add_link" href="#"><fmt:message key="label.add"/></a></div>
 	                </div>
@@ -268,45 +268,45 @@
         <div id="tab_container">
 	        <div class="grid_container">
 	            <div class="grid_header">
-	                <div class="grid_header_cell" style="width: 20%; padding: 1px;">
+	                <div class="grid_header_cell" style="width: 20%;">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.name"/></div>
 	                </div>
-	                <div class="grid_header_cell" style="width: 10%; padding: 1px;">
+	                <div class="grid_header_cell" style="width: 14%;">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.public.port"/></div>
 	                </div>
-	                <div class="grid_header_cell" style="width: 10%; padding: 1px;">
+	                <div class="grid_header_cell" style="width: 14%;">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.private.port"/></div>
 	                </div>
-	                <div class="grid_header_cell" style="width: 15%; padding: 1px;">
+	                <div class="grid_header_cell" style="width: 15%;">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.algorithm"/></div>
 	                </div>	                
-	                <div class="grid_header_cell" style="width: 10%; padding: 1px;">
+	                <div class="grid_header_cell" style="width: 10%;">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.state"/></div>
 	                </div>	                
-	                <div class="grid_header_cell" style="width: 29%; padding: 1px;">
+	                <div class="grid_header_cell" style="width: 25%;">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.actions"/></div>
 	                </div>
 	            </div>
 	            <div class="grid_rows even" id="create_load_balancer_row">
-	                <div class="grid_row_cell" style="width: 20%; padding: 1px;">
+	                <div class="grid_row_cell" style="width: 20%;">
 	                    <input id="name" class="text" style="width: 70%;" type="text" />
 	                    <div id="name_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>
 	                </div>
-	                <div class="grid_row_cell" style="width: 10%; padding: 1px;">
+	                <div class="grid_row_cell" style="width: 14%;">
 	                    <input id="public_port" class="text" style="width: 70%;" type="text" />
 	                    <div id="public_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>
 	                </div>
-	                <div class="grid_row_cell" style="width: 10%; padding: 1px;">
+	                <div class="grid_row_cell" style="width: 14%;">
 	                    <input id="private_port" class="text" style="width: 70%;" type="text" />
 	                    <div id="private_port_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>
 	                </div>
-	                <div class="grid_row_cell" style="width: 15%; padding: 1px;">
+	                <div class="grid_row_cell" style="width: 15%;">
 	                    <select id="algorithm_select" class="select" style="width: 70%;">       
 	                        <!--                
 							<option value="roundrobin">roundrobin</option>
@@ -315,9 +315,9 @@
 	                        -->  
 	                    </select>
 	                </div>	                
-	                <div class="grid_row_cell" style="width: 10%; padding: 1px;">	                  
+	                <div class="grid_row_cell" style="width: 10%;">	                  
 	                </div>	                
-	                <div class="grid_row_cell" style="width: 29%; padding: 1px;">
+	                <div class="grid_row_cell" style="width: 25%;">
 	                    <div class="row_celltitles">
 	                        <a id="add_link" href="#">Add</a></div>
 	                </div>
@@ -388,26 +388,26 @@
 <!-- Load Balancer Template (begin) -->
 <div class="grid_rows odd" id="load_balancer_template" style="display:none">
     <div id="row_container">
-        <div class="grid_row_cell" style="width: 20%; padding: 1px;">
+        <div class="grid_row_cell" style="width: 20%;">
             <div class="row_celltitles" id="name">
                 LB#1</div>
         </div>
-        <div class="grid_row_cell" style="width: 10%; padding: 1px;">
+        <div class="grid_row_cell" style="width: 14%;">
             <div class="row_celltitles" id="public_port">
                 8080</div>
         </div>
-        <div class="grid_row_cell" style="width: 10%; padding: 1px;">
+        <div class="grid_row_cell" style="width: 14%;">
             <div class="row_celltitles" id="private_port">
                 80</div>
         </div>
-        <div class="grid_row_cell" style="width: 15%; padding: 1px;">
+        <div class="grid_row_cell" style="width: 15%;">
             <div class="row_celltitles" id="algorithm">
                 (algorithm)</div>
         </div>        
-        <div class="grid_row_cell" style="width: 10%; padding: 1px;">
+        <div class="grid_row_cell" style="width: 10%;">
             <div class="row_celltitles" id="state"></div>
         </div>  
-        <div class="grid_row_cell" style="width: 29%; padding: 1px;">
+        <div class="grid_row_cell" style="width: 25%;">
             <div class="row_celltitles">
                 <a id="manage_link" href="#" style="float:left;"><fmt:message key="label.manage"/></a>
                 <a id="edit_link" href="#" style="float:left; margin-left:15px;"><fmt:message key="label.edit"/></a>
@@ -427,10 +427,10 @@
             <input id="name" class="text" style="width: 70%;" type="text" />
             <div id="name_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>
         </div>
-        <div class="grid_row_cell" style="width: 10%; padding: 1px;">
+        <div class="grid_row_cell" style="width: 14%; padding: 1px;">
             <div class="row_celltitles" id="public_port"></div>
         </div>
-        <div class="grid_row_cell" style="width: 10%; padding: 1px;">
+        <div class="grid_row_cell" style="width: 14%; padding: 1px;">
             <div class="row_celltitles" id="private_port"></div>
         </div>
         <div class="grid_row_cell" style="width: 15%; padding: 1px;">
@@ -445,7 +445,7 @@
         <div class="grid_row_cell" style="width: 10%; padding: 1px;">
             <div class="row_celltitles" id="state"></div>
         </div>        
-        <div class="grid_row_cell" style="width: 29%; padding: 1px;">
+        <div class="grid_row_cell" style="width: 25%; padding: 1px;">
             <div class="row_celltitles">
                 <a id="save_link" href="#" style="float:left;"><fmt:message key="label.save"/></a>
                 <a id="cancel_link" href="#" style="float:left; margin-left:15px; display:inline;"><fmt:message key="label.cancel"/></a>
@@ -518,22 +518,22 @@
 <!-- Port Forwarding template (begin) -->
 <div class="grid_rows odd" id="port_forwarding_template" style="display: none">    
     <div id="row_container">
-        <div class="grid_row_cell" style="width: 15%; padding: 1px;">
+        <div class="grid_row_cell" style="width: 15%;">
             <div class="row_celltitles" id="public_port"></div>
         </div>
-        <div class="grid_row_cell" style="width: 15%; padding: 1px;">
+        <div class="grid_row_cell" style="width: 15%;">
             <div class="row_celltitles" id="private_port"></div>
         </div>
-        <div class="grid_row_cell" style="width: 15%; padding: 1px;">
+        <div class="grid_row_cell" style="width: 15%;">
             <div class="row_celltitles" id="protocol"></div>
         </div>
-        <div class="grid_row_cell" style="width: 25%; padding: 1px;">
+        <div class="grid_row_cell" style="width: 25%;">
             <div class="row_celltitles" id="vm_name"></div>
         </div>   
-        <div class="grid_row_cell" style="width: 10%; padding: 1px;">
+        <div class="grid_row_cell" style="width: 10%;">
             <div class="row_celltitles" id="state"></div>
         </div>        
-        <div class="grid_row_cell" style="width: 15%; padding: 1px;">
+        <div class="grid_row_cell" style="width: 15%;">
             <div class="row_celltitles">
                 <a id="revoke_link" href="#" style="float:left;"><fmt:message key="label.revoke"/> </a>
                 <!--