diff --git a/web/js/common.js b/web/js/common.js
index 1e68034..989bf56 100644
--- a/web/js/common.js
+++ b/web/js/common.js
@@ -38,6 +38,35 @@ _ITEM_NAME_SPECIAL = {
     "vecosmicticket":	"VE Cosmic Ticket"
 };
 
+WEAPON_TYPE_ABBR = {
+    "Great Sword":  	"GS",
+    "Long Sword":    	"LS",
+    "Sword and Shield":	"Sw",
+    "Dual Blades":	    "DB",
+    "Hammer":	        "Ha",
+    "Hunting Horn":	    "HH",
+    "Lance":	        "La",
+    "Gunlance":	        "GL",
+    "Switch Axe":	    "SA",
+    "Charge Blade":	    "CB",
+    "Insect Glaive":	"IG",
+    "Light Bowgun":	    "LBG",
+    "Heavy Bowgun":	    "HBG",
+    "Bow":      	    "Bow"
+};
+
+ELEMENT_ABBR = {
+    "Fire":         "Fi",
+    "Water":        "Wa",
+    "Thunder":      "Th",
+    "Ice":          "Ic",
+    "Dragon":       "Dr",
+    "Poison":       "Po",
+    "Paralysis":    "Pa",
+    "Sleep":        "Sl",
+    "Blashblight":  "Bl"
+};
+
 (function($) {
     $.QueryString = (function(a) {
         if (a == "") return {};
diff --git a/web/templates/weaponrow.ejs b/web/templates/weaponrow.ejs
index 8fc78bb..2a4eef6 100644
--- a/web/templates/weaponrow.ejs
+++ b/web/templates/weaponrow.ejs
@@ -9,23 +9,29 @@
   <a href="weaponplanner.html?weapon=<%= encodeURIComponent(name) %>"
         ><%= name %></a>
 </td>
-<td><%= wtype %></td>
-<td><%= attack %></td>
+<td><%= wtype_short %></td>
+<td style="text-align:right"><%= attack %></td>
 <td style="text-align:right"><% if (affinity) { %><%= affinity %>%<% } %></td>
 <td>
 <% if (awaken) { %>
-  [<%= awaken_attack %> <%= awaken %>]
+  (<img style="height:.8em" title="Awaken <%= awaken %>"
+            src="img/<%= awaken %>.png" /><%= awaken_attack %>
+            <%= ELEMENT_ABBR[awaken] %>)
 <% } else if (element) { %>
-  (<%= element_attack %> <%= element %>
+  <img style="height:.8em" title="<%= element %>"
+            src="img/<%= element %>.png" /> <%= element_attack %>
+            <%= ELEMENT_ABBR[element] %>
   <% if (element_2) { %>
-    , <%= element_2_attack %> <%= element_2 %>
-  <% } %>)
+    <img style="height:.8em" title="<%= element_2 %>"
+            src="img/<%= element_2 %>.png" /> <%= element_2_attack %>
+            <%= ELEMENT_ABBR[element_2] %>
+  <% } %>
 <% } %>
 </td>
 <td><%= Array(num_slots + 1).join("o")
      %><%= Array(3 - num_slots + 1).join("-") %></td>
 <td>
-<div class="sharpness-bar" title="<%= sharpness_title %>">
+<div class="sharpness-bar" title="<%= sharpness_all_title %>">
 <span style="width:<%= sharpness[0] %>px" class="red"></span>
 <span style="width:<%= sharpness[1] %>px" class="orange"></span>
 <span style="width:<%= sharpness[2] %>px" class="yellow"></span>
@@ -34,7 +40,7 @@
 <span style="width:<%= sharpness[5] %>px" class="white"></span>
 <span style="width:<%= sharpness[6] %>px" class="purple"></span>
 </div>
-<div class="sharpness-bar" title="<%= sharpness_plus_title %>">
+<div class="sharpness-bar" title="<%= sharpness_all_title %>">
 <span style="width:<%= sharpness_plus[0] %>px" class="red"></span>
 <span style="width:<%= sharpness_plus[1] %>px" class="orange"></span>
 <span style="width:<%= sharpness_plus[2] %>px" class="yellow"></span>
@@ -44,6 +50,6 @@
 <span style="width:<%= sharpness_plus[6] %>px" class="purple"></span>
 </div>
 </td>
-<td><%= sharpness_title %></td>
-<td>(<%= sharpness_plus_title %>)</td>
+<td><%= defense ? "+" + defense + " Def" : "" %></td>
+<td><%= phial %></td>
 </tr>
diff --git a/web/weaponlist.html b/web/weaponlist.html
index 1064f4f..1bf9689 100644
--- a/web/weaponlist.html
+++ b/web/weaponlist.html
@@ -217,11 +217,18 @@
                                         data["sharpness"].join(",");
                                   data["sharpness_plus_title"] =
                                         data["sharpness_plus"].join(",");
+                                  data["sharpness_all_title"] =
+                                    data["sharpness_title"] + " ("
+                                    + data["sharpness_plus_title"] + ")";
                               } else {
                                   // gunner weapons have no sharpness
                                   data["sharpness_title"] = "";
                                   data["sharpness_plus_title"] = "";
+                                  data["sharpness_all_title"] = "";
                               }
+                              data["wtype_short"] =
+                                        WEAPON_TYPE_ABBR[data["wtype"]];
+                              data["ELEMENT_ABBR"] = ELEMENT_ABBR;
                               var html = template_row.render(data);
                               $("#weapon_table").append(html);
                           });