diff --git a/src/main/resources/lib/configfiles/configfiles.jelly b/src/main/resources/lib/configfiles/configfiles.jelly
index e46b53e6..7ecafa51 100644
--- a/src/main/resources/lib/configfiles/configfiles.jelly
+++ b/src/main/resources/lib/configfiles/configfiles.jelly
@@ -45,13 +45,13 @@ THE SOFTWARE.
                     <tr valign="center" style="border-top: thin inset darkgray">
                         <td width="32">
                             <a href="editConfig?id=${t.id}">
-                                <img width="16" height="16" title="${%edit script} ${t.name}"
-                                     src="${imagesURL}/16x16/document_edit.gif"/>
+                                <l:icon title="${%edit script} ${t.name}"
+                                     class="icon-notepad icon-md"/>
                             </a>
                             <j:out value=" "/>
                             <l:confirmationLink href="removeConfig?id=${t.id}" post="true" message="Sure you want to delete [${t.name}]?">
-                                <img width="16" height="16" title="${%remove script} ${t.name}"
-                                     src="${imagesURL}/16x16/edit-delete.gif"/>
+                                <l:icon title="${%remove script} ${t.name}"
+                                     class="icon-edit-delete icon-md"/>
                             </l:confirmationLink>
                         </td>
                         <td>
diff --git a/src/main/resources/lib/configfiles/providerlist.jelly b/src/main/resources/lib/configfiles/providerlist.jelly
index d97f18eb..818e6c39 100644
--- a/src/main/resources/lib/configfiles/providerlist.jelly
+++ b/src/main/resources/lib/configfiles/providerlist.jelly
@@ -43,13 +43,13 @@ THE SOFTWARE.
                     <tr valign="center" style="border-top: thin inset darkgray">
                         <td width="32">
                             <a href="editConfig?id=${t.id}">
-                                <img width="16" height="16" title="${%edit script} ${t.name}"
-                                     src="${imagesURL}/16x16/document_edit.gif" />
+                                <l:icon title="${%edit script} ${t.name}"
+                                     class="icon-notepad icon-xlg" />
                             </a>
                             <j:out value=" " />
                             <l:confirmationLink href="removeConfig?id=${t.id}" post="true" message="Sure you want to delete [${t.name}]?">
-                                <img width="16" height="16" title="${%remove script} ${t.name}"
-                                     src="${imagesURL}/16x16/edit-delete.gif" />
+                                <l:icon title="${%remove script} ${t.name}"
+                                     class="icon-edit-delete icon-md" />
                             </l:confirmationLink>
                         </td>
                         <td >
diff --git a/src/main/resources/lib/configfiles/sitepanel.jelly b/src/main/resources/lib/configfiles/sitepanel.jelly
index cb7d23ae..4df757cc 100644
--- a/src/main/resources/lib/configfiles/sitepanel.jelly
+++ b/src/main/resources/lib/configfiles/sitepanel.jelly
@@ -31,9 +31,9 @@ THE SOFTWARE.
     <l:header />
     <l:side-panel>
         <l:tasks>
-            <l:task icon="images/24x24/setting.gif" href="${rootURL}/manage" title="${%Manage Jenkins}" />
-            <l:task icon="images/24x24/next.gif" href="configfiles" title="${%Config Files}" />
-            <l:task icon="images/24x24/new-package.gif" href="selectProvider" title="${%Add a new Config}" />
+            <l:task icon="icon-gear2 icon-md" href="${rootURL}/manage" title="${%Manage Jenkins}" />
+            <l:task icon="icon-next icon-md" href="configfiles" title="${%Config Files}" />
+            <l:task icon="icon-new-package icon-md" href="selectProvider" title="${%Add a new Config}" />
         </l:tasks>
     </l:side-panel>
 </j:jelly>
diff --git a/src/main/resources/org/jenkinsci/plugins/configfiles/ConfigFilesUI/configfiles.jelly b/src/main/resources/org/jenkinsci/plugins/configfiles/ConfigFilesUI/configfiles.jelly
index 780c91fe..4cb6bd7e 100644
--- a/src/main/resources/org/jenkinsci/plugins/configfiles/ConfigFilesUI/configfiles.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/configfiles/ConfigFilesUI/configfiles.jelly
@@ -29,7 +29,7 @@ THE SOFTWARE.
 
     <l:main-panel>
         <h1>
-            <img src="${it.getIconUrl(rootURL)}" alt="" />
+            <img src="${it.getIconUrl(rootURL)}" height="48px" width="48px" alt="" />
             <j:out value=" " />
             ${%Config File Management}
         </h1>
diff --git a/src/main/resources/org/jenkinsci/plugins/configfiles/ConfigFilesUI/edit.jelly b/src/main/resources/org/jenkinsci/plugins/configfiles/ConfigFilesUI/edit.jelly
index 832b98a6..fd7b56f4 100644
--- a/src/main/resources/org/jenkinsci/plugins/configfiles/ConfigFilesUI/edit.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/configfiles/ConfigFilesUI/edit.jelly
@@ -30,7 +30,7 @@ THE SOFTWARE.
 
 		<l:main-panel>
 			<h1>
-				<img width="48" height="48" src="${imagesURL}/16x16/document_edit.gif" />
+				<l:icon class="icon-notepad icon-xlg" />
 				<img width="16" height="16" src="${imagesURL}/16x16/empty.gif" />
 				${%Edit Configuration File}
 			</h1>
@@ -64,4 +64,4 @@ THE SOFTWARE.
 	      });
 	    </script>
     </j:if>	
-</j:jelly>
\ No newline at end of file
+</j:jelly>
diff --git a/src/main/resources/org/jenkinsci/plugins/configfiles/ConfigFilesUI/selectprovider.jelly b/src/main/resources/org/jenkinsci/plugins/configfiles/ConfigFilesUI/selectprovider.jelly
index b6d30b9a..5b19dbc3 100644
--- a/src/main/resources/org/jenkinsci/plugins/configfiles/ConfigFilesUI/selectprovider.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/configfiles/ConfigFilesUI/selectprovider.jelly
@@ -31,7 +31,7 @@ THE SOFTWARE.
 
 		<l:main-panel>
 			<h1>
-				<img width="48" height="48" src="${imagesURL}/16x16/document_edit.gif" />
+				<l:icon class="icon-notepad icon-xlg" />
 				<img width="16" height="16" src="${imagesURL}/16x16/empty.gif" />
 				<j:out value="${%filetype}" />
 			</h1>
@@ -41,4 +41,4 @@ THE SOFTWARE.
 
 		</l:main-panel>
 	</l:layout>
-</j:jelly>
\ No newline at end of file
+</j:jelly>
diff --git a/src/main/webapp/images/mvn_s.png b/src/main/webapp/images/mvn_s.png
deleted file mode 100644
index 4ac382c9..00000000
Binary files a/src/main/webapp/images/mvn_s.png and /dev/null differ
diff --git a/src/main/webapp/images/mvn_s.svg b/src/main/webapp/images/mvn_s.svg
deleted file mode 100644
index 2b2c01bf..00000000
--- a/src/main/webapp/images/mvn_s.svg
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32px"
-   height="32px"
-   id="svg3076"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="New document 5">
-  <defs
-     id="defs3078" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.836083"
-     inkscape:cx="11.665026"
-     inkscape:cy="15.893546"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="882"
-     inkscape:window-height="729"
-     inkscape:window-x="96"
-     inkscape:window-y="77"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3081">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <text
-       xml:space="preserve"
-       style="font-size:45.78290557999999777px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:condensed;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#d24939;fill-opacity:1;stroke:none;font-family:Impact;-inkscape-font-specification:Impact Condensed"
-       x="18.251888"
-       y="23.864328"
-       id="text3088"
-       sodipodi:linespacing="125%"
-       transform="scale(0.97939616,1.0210373)"><tspan
-         sodipodi:role="line"
-         id="tspan3090"
-         x="18.251888"
-         y="23.864328"
-         style="font-size:22.89145278999999888px;fill:#d24939">S</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Courier;-inkscape-font-specification:Courier"
-       x="3.2836401"
-       y="24.738104"
-       id="text3092"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan3094"
-         x="3.2836401"
-         y="24.738104">mvn</tspan></text>
-  </g>
-</svg>