diff --git a/apps/contacts/templates/part.details.php b/apps/contacts/templates/part.details.php
index 4277357b75..119c88486a 100644
--- a/apps/contacts/templates/part.details.php
+++ b/apps/contacts/templates/part.details.php
@@ -24,6 +24,6 @@
 <?php endforeach; ?>
 
 <div id="contacts_cardoptions">
-	<a id="contacts_deletecard"><img class="svg" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></a>
-	<a id="contacts_addproperty"><img class="svg" src="<?php echo image_path('', 'actions/download.svg'); ?>" /></a>
+	<a id="contacts_deletecard"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></a>
+	<a id="contacts_addproperty"><img class="svg action" src="<?php echo image_path('', 'actions/download.svg'); ?>" /></a>
 </div>
diff --git a/apps/contacts/templates/part.property.php b/apps/contacts/templates/part.property.php
index 0658726920..cdb0306812 100644
--- a/apps/contacts/templates/part.property.php
+++ b/apps/contacts/templates/part.property.php
@@ -3,27 +3,27 @@
 		<div class="contacts_propertyname"><?php echo $l->t('Name'); ?></div>
 		<div class="contacts_propertyvalue">
 			<?php echo $_['property']['value']; ?>
-			<span style="display:none;" data-use="edit"><img class="svg" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
+			<span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
 		</div>
 	<?php elseif($_['property']['name'] == 'BDAY'): ?>
 		<div class="contacts_propertyname"><?php echo $l->t('Birthday'); ?></div>
 		<div class="contacts_propertyvalue">
 		<?php echo $l->l('date',new DateTime($_['property']['value'])); ?>
-			<span style="display:none;" data-use="delete"><img class="svg" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
+			<span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
 		</div>
 	<?php elseif($_['property']['name'] == 'ORG'): ?>
 		<div class="contacts_propertyname"><?php echo $l->t('Organisation'); ?></div>
 		<div class="contacts_propertyvalue">
 			<?php echo $_['property']['value']; ?>
-			<span style="display:none;" data-use="edit"><img class="svg" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
-			<span style="display:none;" data-use="delete"><img class="svg" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
+			<span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
+			<span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
 		</div>
 	<?php elseif($_['property']['name'] == 'EMAIL'): ?>
 		<div class="contacts_propertyname"><?php echo $l->t('Email'); ?></div>
 		<div class="contacts_propertyvalue">
 			<?php echo $_['property']['value']; ?>
-			<span style="display:none;" data-use="edit"><img class="svg" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
-			<span style="display:none;" data-use="delete"><img class="svg" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
+			<span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
+			<span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
 		</div>
 	<?php elseif($_['property']['name'] == 'TEL'): ?>
 		<div class="contacts_propertyname"><?php echo $l->t('Telephone'); ?></div>
@@ -32,8 +32,8 @@
 			<?php if(isset($_['property']['parameters']['TYPE'])): ?>
 				(<?php echo $l->t('tel_'.strtolower($_['property']['parameters']['TYPE'])); ?>)
 			<?php endif; ?>
-			<span style="display:none;" data-use="edit"><img class="svg" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
-			<span style="display:none;" data-use="delete"><img class="svg" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
+			<span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
+			<span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
 		</div>
 	<?php elseif($_['property']['name'] == 'ADR'): ?>
 		<div class="contacts_propertyname">
@@ -51,8 +51,8 @@
 			<?php echo $l->t('Region'); ?> <?php echo $_['property']['value'][4]; ?><br>
 			<?php echo $l->t('Postal Code'); ?> <?php echo $_['property']['value'][5]; ?><br>
 			<?php echo $l->t('Country'); ?> <?php echo $_['property']['value'][6]; ?> 
-			<span style="display:none;" data-use="edit"><img class="svg" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
-			<span style="display:none;" data-use="delete"><img class="svg" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
+			<span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
+			<span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
 		</div>
 	<?php endif; ?>
 </div>
diff --git a/apps/media/js/playlist.js b/apps/media/js/playlist.js
index 778939db01..cb7f24522a 100644
--- a/apps/media/js/playlist.js
+++ b/apps/media/js/playlist.js
@@ -5,7 +5,7 @@ PlayList.render=function(){
 		var item=PlayList.items[i];
 		var li=$('<li/>');
 		li.append(item.name);
-		var img=$('<img class="remove" src="'+OC.imagePath('core','actions/delete')+'"/>');
+		var img=$('<img class="remove svg action" src="'+OC.imagePath('core','actions/delete')+'"/>');
 		img.click(function(event){
 			event.stopPropagation();
 			PlayList.remove($(this).parent().data('index'));
diff --git a/core/css/styles.css b/core/css/styles.css
index ff12ab1e07..6ea08d529d 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -102,5 +102,5 @@ li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ff
 -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em;
 -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
 
-.file_action, .selectedActions a, #logout { opacity:.5; }
-.file_action:hover, .selectedActions a:hover, #logout:hover { opacity:1; }
+.action, .selectedActions a, #logout { opacity:.3; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; }
+.action:hover, .selectedActions a:hover, #logout:hover { opacity:1; }
diff --git a/files/css/files.css b/files/css/files.css
index ef86664cf2..af860d60b9 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -60,7 +60,7 @@ table thead.fixed { height:2em; }
 #fileList tr.selected td.filename, #fileList tr:hover td.filename { background-image:url('') !important; }
 #select_all { float:left; margin:.2em; margin-left:.6em; }
 #uploadsize-message,#delete-confirm { display:none; }
-.selectedActions a, a.file_action { float:right; display:inline; margin:0 .5em; padding:.3em .3em 0 .3em !important; }
+.selectedActions a, a.action { float:right; display:inline; margin:0 .5em; padding:.3em .3em 0 .3em !important; }
 .selectedActions { display:none; }
 
 /* add breadcrumb divider to the File item in navigation panel */
diff --git a/files/js/fileactions.js b/files/js/fileactions.js
index 2bc79abe72..a0a04ff166 100644
--- a/files/js/fileactions.js
+++ b/files/js/fileactions.js
@@ -53,7 +53,7 @@ FileActions={
 	},
 	display:function(parent){
 		FileActions.currentFile=parent;
-		$('.file_action').remove();
+		$('.action').remove();
 		var actions=FileActions.get(FileActions.getCurrentMimeType(),FileActions.getCurrentType());
 		var file=FileActions.getCurrentFile();
 		if($('tr[data-file="'+file+'"]').data('renaming')){
@@ -66,7 +66,7 @@ FileActions={
 				if(img.call){
 					img=img(file);
 				}
-				var html='<a href="#" title="'+name+'" class="file_action"/>';
+				var html='<a href="#" title="'+name+'" class="action" />';
 				var element=$(html);
 				if(img){
 					element.append($('<img src="'+img+'"/>'));
@@ -85,7 +85,7 @@ FileActions={
 		}
 		if(actions['Delete']){
 			var img=FileActions.icons['Delete'];
-			var html='<a href="#" title="Delete" class="file_action"/>';
+			var html='<a href="#" title="Delete" class="action" />';
 			var element=$(html);
 			if(img){
 				element.append($('<img src="'+img+'"/>'));
@@ -101,12 +101,12 @@ FileActions={
 			});
 			parent.parent().children().last().append(element);
 		}
-		$('.file_action').hide();
-		$('.file_action').fadeIn(200);
+		$('.action').hide();
+		$('.action').fadeIn(200);
 		return false;
 	},
 	hide:function(){
-		$('.file_action').fadeOut(200,function(){
+		$('.action').fadeOut(200,function(){
 			$(this).remove();
 		});
 	},
diff --git a/settings/js/users.js b/settings/js/users.js
index addf1c2d65..efa08cd0ba 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -104,7 +104,7 @@ $(document).ready(function(){
 		});
 		tr.find('td.groups').append(select);
 		if(tr.find('td.remve img').length==0){
-			tr.find('td.remove').append($('<img alt="Remove" title="'+t('admin','Remove')+'" class="svg" src="'+OC.imagePath('core','actions/delete')+'"/>'));
+			tr.find('td.remove').append($('<img alt="Remove" title="'+t('admin','Remove')+'" class="svg action" src="'+OC.imagePath('core','actions/delete')+'"/>'));
 		}
 		applyMultiplySelect(select);
 		$('#content table tr').last().after(tr);
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 0009c85fa3..7a99c0eb41 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -22,7 +22,7 @@ foreach($_["groups"] as $group) {
 			<td class="name"><?php echo $user["name"]; ?></td>
 			<td class="password">
 				<span>●●●●●●●</span>
-				<img class="svg" src="<?php echo image_path('core','actions/rename')?>"/>
+				<img class="svg action" src="<?php echo image_path('core','actions/rename')?>"/>
 			</td>
 			<td class="groups">
 				<select data-username="<?php echo $user['name'] ;?>" data-user-groups="<?php echo $user['groups'] ;?>" data-placeholder="groups" title="<?php echo $l->t('Groups')?>" multiple="multiple">
@@ -33,7 +33,7 @@ foreach($_["groups"] as $group) {
 			</td>
 			<td class="remove">
 				<?php if($user['name']!=OC_User::getUser()):?>
-					<img alt="Remove" title="<?php echo $l->t('Remove')?>" class="svg" src="<?php echo image_path('core','actions/delete') ?>" />
+					<img alt="Remove" title="<?php echo $l->t('Remove')?>" class="svg action" src="<?php echo image_path('core','actions/delete') ?>" />
 				<?php endif;?>
 			</td>
 		</tr>