diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index 691642811b74f35ba46912065e6839e71becc4d0..87dfea491e76afd917c9ba0bcad616be57612b9f 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -2,9 +2,9 @@
$(document).ready(function() {
if (typeof FileActions !== 'undefined') {
- FileActions.register('all', 'Restore', OC.PERMISSION_READ, OC.imagePath('core', 'actions/undelete.png'), function(filename) {
+ FileActions.register('all', 'Restore', OC.PERMISSION_READ, OC.imagePath('core', 'actions/history'), function(filename) {
var tr=$('tr').filterAttr('data-file', filename);
- var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loader.gif') +'"></a>';
+ var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
var undeleteAction = $('tr').filterAttr('data-file',filename).children("td.date");
var files = tr.attr('data-file');
undeleteAction[0].innerHTML = undeleteAction[0].innerHTML+spinner;
@@ -94,7 +94,7 @@ $(document).ready(function() {
$('.undelete').click('click',function(event) {
event.preventDefault();
- var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loader.gif') +'"></a>';
+ var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
var files=getSelectedFiles('file');
var fileslist = JSON.stringify(files);
var dirlisting=getSelectedFiles('dirlisting')[0];
diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php
index cb5edaa2c91e4718dbb678f3d8943ab9b0575ba9..66ec36df867093975df8de6193669c5e5e7f3a77 100644
--- a/apps/files_trashbin/templates/index.php
+++ b/apps/files_trashbin/templates/index.php
@@ -18,7 +18,7 @@
<span class='selectedActions'>
<a href="" class="undelete">
<img class="svg" alt="<?php p($l->t( 'Restore' )); ?>"
- src="<?php print_unescaped(OCP\image_path("core", "actions/undelete.png")); ?>" />
+ src="<?php print_unescaped(OCP\image_path("core", "actions/history.svg")); ?>" />
<?php p($l->t('Restore'))?>
</a>
</span>
diff --git a/core/css/styles.css b/core/css/styles.css
index 40a17a42876c3b939f0cda97eafdcc83705f2688..6c9d00114a0eeb5248711e78229e0df384689476 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -416,7 +416,13 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
#oc-dialog-filepicker-content .filepicker_element_selected { background-color:lightblue;}
.ui-dialog {position:fixed !important;}
span.ui-icon {float: left; margin: 3px 7px 30px 0;}
+
.loading { background: url('../img/loading.gif') no-repeat center; cursor: wait; }
+.move2trash { /* decrease spinner size */
+ width: 16px;
+ height: 16px;
+}
+
/* ---- CATEGORIES ---- */
#categoryform .scrollarea { position:absolute; left:10px; top:10px; right:10px; bottom:50px; overflow:auto; border:1px solid #ddd; background:#f8f8f8; }
@@ -655,13 +661,13 @@ 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 */
button.loading {
background-image: url('../img/loading.gif');
background-position: right 10px center; background-repeat: no-repeat;
+ background-size: 16px;
padding-right: 30px;
}
diff --git a/core/img/actions/add.png b/core/img/actions/add.png
index 25d472b2dc41bd4412507d422b579ff36abad887..1aac02b84544ac0e8436d7c8e3b14176cd35fb88 100644
Binary files a/core/img/actions/add.png and b/core/img/actions/add.png differ
diff --git a/core/img/actions/add.svg b/core/img/actions/add.svg
index 136d6c4b3118fbab65b3a38d21730db713005958..250746e1660b64662fe0654a67fd5de75b4f8136 100644
--- a/core/img/actions/add.svg
+++ b/core/img/actions/add.svg
@@ -1,10 +1,6 @@
<?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="22" width="22" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
- <linearGradient id="a" y2="45.69" gradientUnits="userSpaceOnUse" x2="24.139" gradientTransform="matrix(.53994 0 0 .53668 -1.7557 -1.7859)" y1="6.5317" x1="24.139">
- <stop stop-color="#fff" offset="0"/>
- <stop stop-color="#fff" stop-opacity="0" offset="1"/>
- </linearGradient>
- </defs>
- <path opacity=".4" d="m8.5932 8.2152v-5.9948h5v5.9948h6v5.0052h-6v6h-5v-6h-6v-5.0052h6z" fill-rule="evenodd" stroke="url(#a)"/>
+<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="matrix(-.70711 -.70711 .70711 -.70711 -724.85 752.16)">
+ <path d="m1.6361 1040.9 2.8284-2.8284 3.5355 3.5355 3.5355-3.5355 2.8284 2.8284-3.5355 3.5355 3.5356 3.5356-2.8284 2.8284-3.5356-3.5356-3.5357 3.5354-2.8281-2.8281 3.5354-3.5357z"/>
+ </g>
</svg>
diff --git a/core/img/actions/delete-hover.png b/core/img/actions/delete-hover.png
deleted file mode 100644
index 048d91cee5143ce826ef9ef3d7619d835bce0877..0000000000000000000000000000000000000000
Binary files a/core/img/actions/delete-hover.png and /dev/null differ
diff --git a/core/img/actions/delete-hover.svg b/core/img/actions/delete-hover.svg
deleted file mode 100644
index 3e8d26c9786d16addcd5df03219d712356c1e09b..0000000000000000000000000000000000000000
--- 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 fa8e18183ed3d126ab5706d093f7e64d944c835a..99f549faf9b70be5d0917d601485170bfae526d8 100644
Binary files a/core/img/actions/delete.png and b/core/img/actions/delete.png differ
diff --git a/core/img/actions/delete.svg b/core/img/actions/delete.svg
index ef564bfd482292f589ad750827209a6b1580fd99..568185c5c70b07ee4a2e8f5c75f8970b31e4280c 100644
--- a/core/img/actions/delete.svg
+++ b/core/img/actions/delete.svg
@@ -1,6 +1,12 @@
-<?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>
+ <metadata>
+ <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/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <path fill="#d40000" d="M8,1c-3.866,0-7,3.134-7,7s3.134,7,7,7,7-3.134,7-7-3.134-7-7-7zm-2.8438,2.75l2.8438,2.8438,2.844-2.8438,1.406,1.4062-2.8438,2.8438,2.8438,2.844-1.406,1.406-2.844-2.8438-2.8438,2.8438-1.4062-1.406,2.8438-2.844-2.8438-2.8438,1.4062-1.4062z"/>
</svg>
diff --git a/core/img/actions/lock.png b/core/img/actions/lock.png
index dbcffa3990f7dace24aaae6836977a142d57fe47..f3121811ea69565b897e2806f7d9aa66ac90bd68 100644
Binary files a/core/img/actions/lock.png and b/core/img/actions/lock.png differ
diff --git a/core/img/actions/mail.png b/core/img/actions/mail.png
index 8e884fbc0ea87ee8549053f603bbf9bf55c29817..be6142444ae8052e6f96c4b8afc3d267704d1507 100644
Binary files a/core/img/actions/mail.png and b/core/img/actions/mail.png differ
diff --git a/core/img/actions/mail.svg b/core/img/actions/mail.svg
index 2c63daac03440c9003f7ac8fc7b5b60ff46e826c..c01f2c113e707feae3133a79367b03debe91fa3a 100644
--- a/core/img/actions/mail.svg
+++ b/core/img/actions/mail.svg
@@ -1,8 +1,4 @@
<?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>
- <rect stroke-linejoin="round" height="10.244" width="15.244" stroke="#000" stroke-linecap="square" y="2.6281" x=".37806" stroke-width=".75613"/>
- <path d="m-0.6 11 8.6-5l8.6 5" stroke="#fff" stroke-width="1px" fill="none"/>
- <path d="m0 2.5 8 6.5 8-6.5" stroke="#fff" stroke-linecap="round" stroke-width="1px"/>
- </g>
+<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.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path d="m0.88889 3c-0.49245 0-0.88889 0.3968-0.88889 0.8892v8.2228c0 0.492 0.39644 0.888 0.88889 0.888h14.222c0.493 0 0.889-0.396 0.889-0.888v-8.2228c0-0.4924-0.396-0.8892-0.889-0.8892zm0.75 1.0281 6.0833 6.0833h0.52778l6.1111-6.0833 0.61111 0.61111-3.6389 3.6944 2.75 2.8056-0.61111 0.61111-2.8056-2.8056-2.0278 2.0556h-1.2778l-2.0271-2.0552-2.8055 2.8332-0.6111-0.639 2.7777-2.8054-3.6666-3.6944z"/>
</svg>
diff --git a/core/img/actions/undelete.png b/core/img/actions/undelete.png
deleted file mode 100644
index d712527ef617dca921bcf75b917a1f728bc2102c..0000000000000000000000000000000000000000
Binary files a/core/img/actions/undelete.png and /dev/null differ
diff --git a/core/img/loader.gif b/core/img/loader.gif
deleted file mode 100644
index e192ca895cd00d6b752ec84619b787188f30ee41..0000000000000000000000000000000000000000
Binary files a/core/img/loader.gif and /dev/null differ
diff --git a/core/img/loading-dark.gif b/core/img/loading-dark.gif
index 5fe86acabc41f3cd97b09eb626e5e9020d5ea28e..13f0f64eab152fa4949476ed83ea24d6fd45a9bc 100644
Binary files a/core/img/loading-dark.gif and b/core/img/loading-dark.gif differ
diff --git a/core/img/loading.gif b/core/img/loading.gif
index 5b33f7e54f4e55b6b8774d86d96895db9af044b4..f8f3dff6fb955ebc02453352e59c845461723292 100644
Binary files a/core/img/loading.gif and b/core/img/loading.gif differ
diff --git a/core/img/remoteStorage-big.png b/core/img/remoteStorage-big.png
deleted file mode 100644
index 7e76e21209e539354805d12d8f92c5a8176c0861..0000000000000000000000000000000000000000
Binary files a/core/img/remoteStorage-big.png and /dev/null differ
diff --git a/core/img/weather-clear.png b/core/img/weather-clear.png
deleted file mode 100644
index 0acf7a9b2afd4ba9b8492f51d5204721f9e4559a..0000000000000000000000000000000000000000
Binary files a/core/img/weather-clear.png and /dev/null differ