differentiate delete from close icon

5 files changed, 63 insertions, 11 deletions

diff --git a/core/css/styles.css b/core/css/styles.css
index 40a17a42876..7100b8c290d 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -655,7 +655,6 @@ div.crumb:active {
 /* icons */
 .folder-icon { background-image: url('../img/places/folder.svg'); }
 .delete-icon { background-image: url('../img/actions/delete.svg'); }
-.delete-icon:hover { background-image: url('../img/actions/delete-hover.svg'); }
 .edit-icon { background-image: url('../img/actions/rename.svg'); }
 
 /* buttons */
diff --git a/core/img/actions/delete-hover.png b/core/img/actions/delete-hover.png
deleted file mode 100644
index 048d91cee51..00000000000
--- a/core/img/actions/delete-hover.png
+++ /dev/null
diff --git a/core/img/actions/delete-hover.svg b/core/img/actions/delete-hover.svg
deleted file mode 100644
index 3e8d26c9786..00000000000
--- a/core/img/actions/delete-hover.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g transform="translate(0 -1036.4)">
-  <path d="m3 1040.4 1-1 4 3 4-3 1 1-3 4 3 4-1 1-4-3-4 3-1-1 3-4z" fill="#d40000"/>
- </g>
-</svg>
diff --git a/core/img/actions/delete.png b/core/img/actions/delete.png
index fa8e18183ed..6362903937c 100644
--- a/core/img/actions/delete.png
+++ b/core/img/actions/delete.png
diff --git a/core/img/actions/delete.svg b/core/img/actions/delete.svg
index ef564bfd482..08ea381f378 100644
--- a/core/img/actions/delete.svg
+++ b/core/img/actions/delete.svg
@@ -1,6 +1,65 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g transform="translate(0 -1036.4)">
-  <path d="m3 1040.4 1-1 4 3 4-3 1 1-3 4 3 4-1 1-4-3-4 3-1-1 3-4z"/>
- </g>
+<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"
+   height="16"
+   width="16"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="delete.svg"
+   inkscape:export-filename="delete.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <metadata
+     id="metadata12">
+    <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>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="1.84375"
+     inkscape:cx="-61.031156"
+     inkscape:cy="-20.822232"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     inkscape:connector-curvature="0"
+     d="m 8,0.9999996 c -3.866,0 -7,3.134 -7,7 C 1,11.866 4.134,15 8,15 c 3.866,0 7,-3.134 7,-7.0000004 0,-3.866 -3.134,-7 -7,-7 z"
+     id="path4"
+     sodipodi:nodetypes="sssss"
+     style="fill:#d40000;fill-opacity:1" />
+  <path
+     style="fill:#ffffff;stroke:none"
+     d="m 4,7 0,2 8,0 0,-2 z"
+     id="path3008"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" />
 </svg>