diff --git a/app/assets/images/icon-critical.svg b/app/assets/images/icon-critical.svg
index 3e63a84..93a0ac1 100644
--- a/app/assets/images/icon-critical.svg
+++ b/app/assets/images/icon-critical.svg
@@ -1,13 +1,13 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 40 40" style="enable-background:new 0 0 40 40;" xml:space="preserve">
+	 viewBox="0 0 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill:#E62325;}
-	.st1{opacity:0.4;fill:#E62325;}
+	.st1{opacity:0.4;fill:#E62325;enable-background:new    ;}
 	.st2{fill:none;stroke:#E62325;stroke-width:2;stroke-miterlimit:10;}
 </style>
-<path class="st0" d="M20,12c4.4,0,8,3.6,8,8s-3.6,8-8,8s-8-3.6-8-8S15.6,12,20,12 M20,10c-5.5,0-10,4.5-10,10s4.5,10,10,10
-	s10-4.5,10-10S25.5,10,20,10L20,10z"/>
-<circle class="st1" cx="20" cy="20" r="8"/>
-<line class="st2" x1="14.3" y1="14.3" x2="25.7" y2="25.7"/>
-<line class="st2" x1="25.7" y1="14.3" x2="14.3" y2="25.7"/>
+<path class="st0" d="M10,2.3c4.3,0,7.7,3.5,7.7,7.7s-3.5,7.7-7.7,7.7S2.3,14.3,2.3,10S5.8,2.3,10,2.3 M10,0.4
+	c-5.3,0-9.7,4.3-9.7,9.7s4.3,9.7,9.7,9.7s9.7-4.3,9.7-9.7S15.3,0.4,10,0.4L10,0.4z"/>
+<circle class="st1" cx="10" cy="10" r="7.7"/>
+<line class="st2" x1="4.5" y1="4.5" x2="15.5" y2="15.6"/>
+<line class="st2" x1="15.5" y1="4.5" x2="4.5" y2="15.6"/>
 </svg>
diff --git a/app/assets/images/icon-warning.svg b/app/assets/images/icon-warning.svg
index 346893a..dd9b3dd 100644
--- a/app/assets/images/icon-warning.svg
+++ b/app/assets/images/icon-warning.svg
@@ -1,11 +1,13 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 40 40" style="enable-background:new 0 0 40 40;" xml:space="preserve">
+	 viewBox="0 0 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve">
 <style type="text/css">
-	.st0{opacity:0.4;fill:#FFB000;}
+	.st0{opacity:0.4;fill:#FFB000;enable-background:new    ;}
 	.st1{fill:#FFB000;}
 </style>
-<polygon class="st0" points="10.8,28.8 20,12.8 29.2,28.8 "/>
-<path class="st1" d="M20,9.6L8,30.4h24L20,9.6z M20,12.8l9.2,16H10.8L20,12.8z"/>
-<path d="M19,17.5v1.7l0.5,4.3h1l0.5-4.3v-1.7H19z"/>
-<circle cx="20" cy="26" r="1"/>
+<g>
+	<polygon class="st0" points="2.5,17 10,4 17.5,17 	"/>
+	<path class="st1" d="M10,1.4L0.3,18.3h19.5L10,1.4z M10,4l7.5,13h-15L10,4z"/>
+	<path d="M9.2,7.8v1.4l0.4,3.5h0.8l0.4-3.5V7.8H9.2z"/>
+	<circle cx="10" cy="14.7" r="0.8"/>
+</g>
 </svg>
diff --git a/app/configuration/controllers/firmware-controller.html b/app/configuration/controllers/firmware-controller.html
index edf8c16..76dbfe2 100644
--- a/app/configuration/controllers/firmware-controller.html
+++ b/app/configuration/controllers/firmware-controller.html
@@ -9,23 +9,20 @@
 	</div>
 </div>
 <div class="row column">
-	<p>Use the tables at the top of the page to manage firmware images that are currently available on the BMC. The
-		image at the top of the table is the Primary image, which will be used the next time the device is
-		booted. To change which image is Primary, move the image you want to use as the Primary to the top of the table using the arrows.</p>
-	<p><a ng-click="gotoAnchor()">Scroll down to upload an image file</a> to transfer a new firmware image to the BMC. After uploading a new image, Activate it to make it availbe for use.</p>
+	<p>Use the following tables to manage firmware image files. The image file that is listed as Active is used the next time that the device is booted. To change the boot order for the image, click the arrow icons.</p>
+	<p><a ng-click="gotoAnchor()">Scroll down to upload an image file</a> to transfer a new firmware image to the BMC. After uploading a new image, Activate it to make it available for use.</p>
 </div>
 <firmware-list title="BMC images" version="bmcActiveVersion" firmwares="firmwares" filter-by="filters.bmc"></firmware-list>
 <firmware-list title="Server images" version="hostActiveVersion" firmwares="firmwares" filter-by="filters.host"></firmware-list>
 <div class="row column" id="upload">
 	<div class="column small-12 page-header">
-		<h2 class="inline h3 bold">Upload firmware image</h2>
+		<h2 class="inline h3 bold">Specify image file location</h2>
 	</div>
 	<form id="firmware__upload-form" role="form" class="firmware__upload-form">
-		<p>Specify an image file located on your workstation or a TFTP server. An image file may contain firmware images for the server, BMC, or other hardware devices. Each image that you upload will be unpacked from the image file, and added to the appropriate list above.</p>
+		<p>Specify an image file located on your workstation or a TFTP server. An image file may contain firmware images for the server, BMC, or other hardware devices. Each image that you upload will be unpacked from the image file and added to the appropriate list above.</p>
 		<div class=" column firmware__upload-station">
-			<h3 class="h4 bold">Upload from workstation</h3>
-			<p>Optional text area. Can be used to explain about updating openBMC firmware from workstation. This could
-				be step-by-step instruction. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce et</p>
+			<h3 class="h4 bold">Upload image file from workstation</h3>
+			<p>Select the image file saved on the workstation storage medium to upload to the server BMC.</p>
 			<label for="file-upload" class="inline firmware__upload-chooser">
 				<input id="file-upload" type="file" file="file" class="hide" onchange="angular.element(this).scope().fileNameChanged()"/>
 				<span class="button btn-secondary inline">Choose a file</span>
@@ -35,13 +32,12 @@
 			<div class="inline uploading" ng-show="uploading">Upload in progress...</div>
 		</div>
 		<div class=" column firmware__upload-tftp">
-			<h3 class="h4 bold">Download from TFTP server</h3>
-			<p>Optional text area. Can be used to explain about updating openBMC firmware from workstation. This could
-				be step-by-step instruction. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce et</p>
+			<h3 class="h4 bold">Download image file from TFTP server</h3>
+			<p>Specify both the TFTP server IP address and the image file name stored on it to download to the server BMC.</p>
 			<fieldset>
 				<div class="row">
 					<div class="column small-12 large-4">
-						<label for="tftp-ip">Server IP address</label>
+						<label for="tftp-ip">TFTP Server IP address</label>
 						<input name="tftp-ip" id="tftp-ip" type="number"/>
 					</div>
 					<div class="column small-12 large-4">
diff --git a/app/configuration/styles/firmware.scss b/app/configuration/styles/firmware.scss
index 68fa0fc..c634778 100644
--- a/app/configuration/styles/firmware.scss
+++ b/app/configuration/styles/firmware.scss
@@ -19,11 +19,20 @@
       color: $medblue;
       &.disabled {
         color: $medgrey;
+        &:hover {
+          cursor: default;
+        }
+      }
+      &:hover {
+        cursor: pointer;
       }
     }
     .icon.icon-as-spacer {
       text-indent: 0;
       color: $btn__disabled-txt;
+      &:hover {
+        cursor: default;
+      }
     }
   }