diff --git a/images/images.qrc b/images/images.qrc
index 903badd7aa8b..9a3684c398c3 100644
--- a/images/images.qrc
+++ b/images/images.qrc
@@ -111,7 +111,7 @@
         <file>themes/default/join_miter.png</file>
         <file>themes/default/join_round.png</file>
         <file>themes/default/join_style.svg</file>
-        <file>themes/default/locked.png</file>
+        <file>themes/default/locked.svg</file>
         <file>themes/default/mAction.svg</file>
         <file>themes/default/mActionAdd.png</file>
         <file>themes/default/mActionAddAllToOverview.png</file>
@@ -427,7 +427,7 @@
         <file>themes/default/tracking.png</file>
         <file>themes/default/transformed.png</file>
         <file>themes/default/transp-background_8x8.png</file>
-        <file>themes/default/unlocked.png</file>
+        <file>themes/default/unlocked.svg</file>
         <file>themes/default/user.png</file>
         <file>flags/bs_BA.png</file>
         <file>flags/eu.png</file>
diff --git a/images/themes/default/locked.svg b/images/themes/default/locked.svg
new file mode 100644
index 000000000000..1358700cf152
--- /dev/null
+++ b/images/themes/default/locked.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0"
+	 id="svg5692" sodipodi:docname="locked.svg" inkscape:version="0.47 r22583" inkscape:export-filename="/mnt/home1/robert/svn/graphics/trunk/toolbar-icons/24x24/locked.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px" height="24px"
+	 viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="layer4" transform="translate(0,-8)" inkscape:groupmode="layer" inkscape:label="1">
+	<g>
+		
+			<path id="path2930_2_" sodipodi:nodetypes="cc" fill="none" stroke="#888A85" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" d="
+			M6.19,19.6c0-6,1.188-9,5.81-9s5.811,3,5.811,9"/>
+		<path id="path2932_1_" sodipodi:nodetypes="cc" fill="none" stroke="#EEEEEC" stroke-linecap="round" stroke-linejoin="round" d="
+			M6.19,19.6c0-6,1.188-9,5.81-9s5.811,3,5.811,9"/>
+	</g>
+	
+		<linearGradient id="rect2912_1_" gradientUnits="userSpaceOnUse" x1="304.085" y1="-376.5" x2="307.9159" y2="-376.5" gradientTransform="matrix(1 0 0 -1 -294 -351)">
+		<stop  offset="0" style="stop-color:#E9B96E"/>
+		<stop  offset="1" style="stop-color:#E19E36"/>
+	</linearGradient>
+	<path id="rect2912" fill="url(#rect2912_1_)" stroke="#C17D11" stroke-linecap="round" stroke-linejoin="round" d="M4.721,20
+		h14.558c0.423,0,0.766,0.411,0.766,0.917v9.166c0,0.507-0.343,0.917-0.766,0.917H4.721c-0.423,0-0.766-0.41-0.766-0.917v-9.166
+		C3.955,20.411,4.298,20,4.721,20z"/>
+</g>
+</svg>
diff --git a/images/themes/default/unlocked.svg b/images/themes/default/unlocked.svg
new file mode 100644
index 000000000000..a3562d47fd99
--- /dev/null
+++ b/images/themes/default/unlocked.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0"
+	 id="svg5692" sodipodi:docname="unlocked.svg" inkscape:version="0.47 r22583" inkscape:export-filename="/mnt/home1/robert/svn/graphics/trunk/toolbar-icons/24x24/unlocked.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px" height="24px"
+	 viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="layer4" transform="translate(0,-8)" inkscape:groupmode="layer" inkscape:label="1">
+	<g>
+		
+			<path id="path2930_2_" sodipodi:nodetypes="cc" fill="none" stroke="#888A85" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" d="
+			M7.569,15.023c3.284-5.021,5.921-6.882,9.789-4.351c3.868,2.53,3.221,5.69-0.064,10.711"/>
+		<path id="path2932_1_" sodipodi:nodetypes="cc" fill="none" stroke="#EEEEEC" stroke-linecap="round" stroke-linejoin="round" d="
+			M7.569,15.023c3.284-5.021,5.921-6.882,9.789-4.351c3.868,2.53,3.221,5.69-0.064,10.711"/>
+	</g>
+	
+		<linearGradient id="rect2912_1_" gradientUnits="userSpaceOnUse" x1="303.8574" y1="-376.5" x2="308.1431" y2="-376.5" gradientTransform="matrix(1 0 0 -1 -294 -351)">
+		<stop  offset="0" style="stop-color:#E9B96E"/>
+		<stop  offset="1" style="stop-color:#E19E36"/>
+	</linearGradient>
+	<path id="rect2912" fill="url(#rect2912_1_)" stroke="#C17D11" stroke-linecap="round" stroke-linejoin="round" d="M3.857,20
+		h16.285C20.616,20,21,20.411,21,20.917v9.166C21,30.59,20.616,31,20.143,31H3.857C3.384,31,3,30.59,3,30.083v-9.166
+		C3,20.411,3.384,20,3.857,20z"/>
+</g>
+</svg>
diff --git a/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp b/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
index 8dff7e4e1a29..647326ed05a7 100644
--- a/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
+++ b/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
@@ -160,8 +160,8 @@ QgsSymbolV2SelectorDialog::QgsSymbolV2SelectorDialog( QgsSymbolV2* symbol, QgsSt
   btnAddLayer->setIcon( QIcon( QgsApplication::iconPath( "symbologyAdd.png" ) ) );
   btnRemoveLayer->setIcon( QIcon( QgsApplication::iconPath( "symbologyRemove.png" ) ) );
   QIcon iconLock;
-  iconLock.addFile( QgsApplication::iconPath( "locked.png" ), QSize(), QIcon::Normal, QIcon::On );
-  iconLock.addFile( QgsApplication::iconPath( "unlocked.png" ), QSize(), QIcon::Normal, QIcon::Off );
+  iconLock.addFile( QgsApplication::iconPath( "locked.svg" ), QSize(), QIcon::Normal, QIcon::On );
+  iconLock.addFile( QgsApplication::iconPath( "unlocked.svg" ), QSize(), QIcon::Normal, QIcon::Off );
   btnLock->setIcon( iconLock );
   btnUp->setIcon( QIcon( QgsApplication::iconPath( "symbologyUp.png" ) ) );
   btnDown->setIcon( QIcon( QgsApplication::iconPath( "symbologyDown.png" ) ) );