diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/calendar.css b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/calendar.css
index a2777a0..3838806 100644
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/calendar.css
+++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/calendar.css
@@ -1,2 +1,2 @@
-.calendartablecells { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 11px; text-align:center}
-.todaytablecell { background-color:yellow; border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 11px; text-align:center}
\ No newline at end of file
+.calendartablecells { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font: icon; font-size: 11px; text-align:center}
+.todaytablecell { background-color:yellow; border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font: icon; font-size: 11px; text-align:center}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/toolbar.css b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/toolbar.css
index 775b8a2..485ea12 100644
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/toolbar.css
+++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/toolbar.css
@@ -5,7 +5,7 @@
 .toolbarbodymargin { margin: 5 5 0 5; background: #ECE9D8; }
 
 /* Toolbar Styles */
-.text {font-size:12px; font-family: Tahoma;}
+.text {font-size:12px; font: icon;}
 a:link {color: black;}
 
 /* JS Rollover Style */
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/treeview.css b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/treeview.css
index 64615e3..da1e6a5 100644
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/treeview.css
+++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/treeview.css
@@ -1,5 +1,5 @@
 a {text-decoration: none;}
 a:hover {text-decoration: underline;}
-td {font-family: Tahoma; font-size: 12px; color: Black;}
+td {font: icon; font-size: 12px; color: Black;}
 .unselectedTextAnchor {color:blue; background-color:document.backgroundColor}
 .selectedTextAnchor {color:white; background-color:navy}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/windows.css b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/windows.css
index c6be232..4e15f84 100644
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/windows.css
+++ b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/css/windows.css
@@ -5,35 +5,35 @@
 .contentbodymargin { margin: 0 5 12 5; background:#ECE9D8; }
 
 /* Document Styles  */
-.labels { font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 12px; color:black; font-weight: normal;}
+.labels { font: icon; font-size: 12px; color:black; font-weight: normal;}
 
 /* fieldset+legend Styles */
 .keylinefieldset { border-color:#8080FF; border-width:1px; border-style:solid; }
 
 /* table Styles */
 .tableborder {border-left:0px solid #B8B4A3; border-right:1px solid #B8B4A3; border-top:1px solid #B8B4A3; border-bottom:0px solid #B8B4A3; }
-.tablecells { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 11px; text-align:left}
-.checkboxcells { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 11px; background-color: #ECE9D8}
-th.headercolor { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font-style: normal; font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 11px; background-color:#4977B4; color:#FFFFFF; text-align:center}
-th.singleheadercolor { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font-style: normal; font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 11px; background-color:#4977B4; color:#FFFFFF; text-align:left}
-.firstcolumnerrantrowcolor { border-left:1px solid red; border-right:0px solid #B7B4A3; border-top:1px solid red; border-bottom:1px solid red; font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 11px; background-color:#E6EAD8; text-align:left}
-.middleerrantrowcolor { border-left:1px solid #B7B4A3; border-right:0px solid #B7B4A3; border-top:1px solid red; border-bottom:1px solid red; font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 11px; background-color:#E6EAD8; text-align:left}
-.lastcolumnerrantrowcolor { border-left:1px solid #B7B4A3; border-right:1px solid red; border-top:1px solid red; border-bottom:1px solid red; font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 11px; background-color:#E6EAD8; text-align:left}
-.rowcolor { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 11px; background-color:#E6EAD8; text-align:left}
+.tablecells { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font: icon; font-size: 11px; text-align:left}
+.checkboxcells { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font: icon; font-size: 11px; background-color: #ECE9D8}
+th.headercolor { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font-style: normal; font: icon; font-size: 11px; background-color:#4977B4; color:#FFFFFF; text-align:center}
+th.singleheadercolor { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font-style: normal; font: icon; font-size: 11px; background-color:#4977B4; color:#FFFFFF; text-align:left}
+.firstcolumnerrantrowcolor { border-left:1px solid red; border-right:0px solid #B7B4A3; border-top:1px solid red; border-bottom:1px solid red; font: icon; font-size: 11px; background-color:#E6EAD8; text-align:left}
+.middleerrantrowcolor { border-left:1px solid #B7B4A3; border-right:0px solid #B7B4A3; border-top:1px solid red; border-bottom:1px solid red; font: icon; font-size: 11px; background-color:#E6EAD8; text-align:left}
+.lastcolumnerrantrowcolor { border-left:1px solid #B7B4A3; border-right:1px solid red; border-top:1px solid red; border-bottom:1px solid red; font: icon; font-size: 11px; background-color:#E6EAD8; text-align:left}
+.rowcolor { border-left:1px solid #B8B4A3; border-right:0px solid #B8B4A3; border-top:0px solid #B8B4A3; border-bottom:1px solid #B8B4A3; font: icon; font-size: 11px; background-color:#E6EAD8; text-align:left}
 
 /* Form elements and status contents */
-td { font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 12px; }
-th { font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 12px; }
-input { font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 12px; }
-.selectlist {font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 12px; color: Black; border-style:solid; border-width : 1px;  border-color:#C7C5B2;}
-select { font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 12px; }
-pre { font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 12px; }
-.smtextenter {font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 14px; color: Black; border-style:solid; border-width : 1px; border-color: #C7C5B2; width:10%; }
-.textenter {font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 14px; color: Black; border-style:solid; border-width : 1px; border-color: #C7C5B2; width:90%; }
-.tabletextenter {font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 14px; color: Black; border-style:solid; border-width : 1px; border-color: #C7C5B2; width:100%; }
-.tablefilebrowse {width:100%; border-style:solid; border-width:1px; font-size: 14px; border-color: #C7C5B2; font-family: Tahoma, Verdana, Arial, Helvetica; }
-input.button {font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 11px; border-width : 1px; border-style:outset; height:22px;}
-input.radio {font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 11px;}
+td { font: icon; font-size: 12px; }
+th { font: icon; font-size: 12px; }
+input { font: icon; font-size: 12px; }
+.selectlist {font: icon; font-size: 12px; color: Black; border-style:solid; border-width : 1px;  border-color:#C7C5B2;}
+select { font: icon; font-size: 12px; }
+pre { font: icon; font-size: 12px; }
+.smtextenter {font: icon; font-size: 14px; color: Black; border-style:solid; border-width : 1px; border-color: #C7C5B2; width:10%; }
+.textenter {font: icon; font-size: 14px; color: Black; border-style:solid; border-width : 1px; border-color: #C7C5B2; width:90%; }
+.tabletextenter {font: icon; font-size: 14px; color: Black; border-style:solid; border-width : 1px; border-color: #C7C5B2; width:100%; }
+.tablefilebrowse {width:100%; border-style:solid; border-width:1px; font-size: 14px; border-color: #C7C5B2; font: icon; }
+input.button {font: icon; font-size: 11px; border-width : 1px; border-style:outset; height:22px;}
+input.radio {font: icon; font-size: 11px;}
 img.twist {border-width:0 0 0 0px; height:10px; width:11px;}
 
 /* Fragment Styles */
@@ -41,5 +41,5 @@
 .innerfixfragtable {width:100%; border:0px none; }
 .rangefragtable {width:95%; border-left:0px solid #B8B4A3; border-right:1px solid #B8B4A3; border-top:1px solid #B8B4A3; border-bottom:0px solid #B8B4A3;}
 .innerrangefragtable {width:100%; border-left:0px solid #B8B4A3; border-right:1px solid #B8B4A3; border-top:1px solid #B8B4A3; border-bottom:0px solid #B8B4A3;}
-.textareaenter {font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 14px; color: Black; border-style:solid; border-width : 1px; border-color: #C7C5B2; width:100%; height:150px; }
-.bigtextareaenter {font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 14px; color: Black; border-style:solid; border-width : 1px; border-color: #C7C5B2; width:100%; height:300px; }
+.textareaenter {font: icon; font-size: 14px; color: Black; border-style:solid; border-width : 1px; border-color: #C7C5B2; width:100%; height:150px; }
+.bigtextareaenter {font: icon; font-size: 14px; color: Black; border-style:solid; border-width : 1px; border-color: #C7C5B2; width:100%; height:300px; }