diff --git a/frontend/templates/default/static/css/cvm.css b/frontend/templates/default/static/css/cvm.css
index 4696ad2..37fd7f8 100644
--- a/frontend/templates/default/static/css/cvm.css
+++ b/frontend/templates/default/static/css/cvm.css
@@ -269,7 +269,7 @@ tr.clickable:hover
 
 #button_password
 {
-	background-image: url(../images/menu/password.png);
+	background-image: url(../images/menu/lock.png);
 }
 
 .quota-item
diff --git a/frontend/templates/default/static/images/menu/key.png b/frontend/templates/default/static/images/menu/key.png
new file mode 100644
index 0000000..99abe67
Binary files /dev/null and b/frontend/templates/default/static/images/menu/key.png differ
diff --git a/frontend/templates/default/static/images/menu/lock.png b/frontend/templates/default/static/images/menu/lock.png
new file mode 100644
index 0000000..5781586
Binary files /dev/null and b/frontend/templates/default/static/images/menu/lock.png differ
diff --git a/frontend/templates/default/static/images/menu/password.png b/frontend/templates/default/static/images/menu/user.png
similarity index 100%
rename from frontend/templates/default/static/images/menu/password.png
rename to frontend/templates/default/static/images/menu/user.png
diff --git a/graphics/icon_key.svg b/graphics/icon_key.svg
new file mode 100644
index 0000000..ddf8247
--- /dev/null
+++ b/graphics/icon_key.svg
@@ -0,0 +1,65 @@
+<?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="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="icon_key.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.678384"
+     inkscape:cx="9.8172128"
+     inkscape:cy="8.1359893"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1366"
+     inkscape:window-height="713"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="color:#000000;fill:#343352;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.06148081000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 4.2273242,1043.2465 0,2.1683 2.4976577,0 0.9331908,-0.9332 0.9331908,0.9332 0.1921275,0 0.027447,0 0.5763825,-0.6038 0.603829,0.6038 0.3842545,0 0.356809,-0.3568 0.356808,0.3568 0.905744,0 0.384255,-0.3842 0.411701,0.3842 0.384255,0 0.548936,-0.5764 0.576383,0.5764 0.05489,0 1.53702,-1.29 0,-0.1921 -1.207658,-0.6862 -5.5716973,0 -1.8389348,0 -3.0465935,0 z"
+       id="rect3755"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:#343352;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.03612762000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 3.15625 4.78125 C 1.5057829 4.78125 0.15625 6.2110171 0.15625 7.96875 C 0.15625 9.7264829 1.5057829 11.15625 3.15625 11.15625 C 4.8067171 11.15625 6.15625 9.7264829 6.15625 7.96875 C 6.15625 6.2110171 4.8067171 4.78125 3.15625 4.78125 z M 1.71875 7.34375 C 2.0761495 7.34375 2.375 7.6426005 2.375 8 C 2.375 8.3573995 2.0761495 8.65625 1.71875 8.65625 C 1.3613505 8.65625 1.0625 8.3573995 1.0625 8 C 1.0625 7.6426005 1.3613505 7.34375 1.71875 7.34375 z "
+       transform="translate(0,1036.3622)"
+       id="path2985" />
+  </g>
+</svg>
diff --git a/graphics/icon_lock.svg b/graphics/icon_lock.svg
new file mode 100644
index 0000000..18f565e
--- /dev/null
+++ b/graphics/icon_lock.svg
@@ -0,0 +1,67 @@
+<?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="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="icon_lock.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-3.6725273"
+     inkscape:cy="15.706944"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1366"
+     inkscape:window-height="713"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="color:#000000;fill:#343352;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.042;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 7.9855567,1036.7882 c -2.4565114,0 -4.448994,1.9506 -4.5554277,4.3813 -4.239e-4,0.01 3.639e-4,0.02 0,0.029 l 0,3.3368 1.0445566,0 0,-0.8415 0.7544021,0 0,-2.6114 c 0.084093,-1.4444 1.2905671,-2.6114 2.756469,-2.6114 1.4659915,0 2.6725063,1.1669 2.7564693,2.6114 l 0,2.6114 0.754402,0 0,0.8415 1.073572,0 0,-3.3368 0,-0.029 c -0.107795,-2.4308 -2.127843,-4.3813 -4.5844433,-4.3813 z"
+       id="path3842"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="color:#000000;fill:#343352;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.042;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect3840"
+       width="10.701303"
+       height="8.6809988"
+       x="2.6493487"
+       y="1043.2551" />
+  </g>
+</svg>
diff --git a/graphics/password.svg b/graphics/user.svg
similarity index 100%
rename from graphics/password.svg
rename to graphics/user.svg