diff --git a/newznab/build/nntmux.xml b/newznab/build/nntmux.xml
index c6f3d07ee..00d73c47a 100755
--- a/newznab/build/nntmux.xml
+++ b/newznab/build/nntmux.xml
@@ -6,13 +6,12 @@
 			<file>225</file>
 		</sql>
 		<git>
-			<tag>0.0.0
-</tag>
+			<tag>0.4.2</tag>
 			<!-- commit count removed -->
 			<hooks>
 				<precommit>9</precommit>
 				<!-- this is the version of the pre-commit file in githooks NOT the files it calls -->
 			</hooks>
-		<commit>4436</commit></git>
+		<commit>4437</commit></git>
 	</versions>
 </newznab>
diff --git a/resources/db/patches/mysql/+1~dnzb_failures.sql b/resources/db/patches/mysql/+1~dnzb_failures.sql
deleted file mode 100644
index d331da40b..000000000
--- a/resources/db/patches/mysql/+1~dnzb_failures.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-# This patch will eliminate the useless id column from dnzb_failures
-# This should improve query times for failed releases operations across the board
-# and save a little hdd/ram space
-
-# Remove auto_increment, drop and recreate the primary key , rename releaseid column and drop
-# index
-ALTER TABLE dnzb_failures
-  MODIFY COLUMN id INT(11) UNSIGNED NOT NULL,
-  CHANGE COLUMN releaseid release_id INT(11) UNSIGNED  NOT NULL AFTER id,
-  DROP INDEX ux_dnzb_failures,
-  DROP PRIMARY KEY,
-  ADD PRIMARY KEY (release_id, userid),
-  DROP INDEX ix_dnzb_releaseid;
-
-# Drop the id and guid columns
-ALTER TABLE dnzb_failures
-  DROP COLUMN id,
-  DROP COLUMN guid;
diff --git a/www/admin/regex-edit.php b/www/admin/regex-edit.php
index 817a4ec46..5662e6762 100644
--- a/www/admin/regex-edit.php
+++ b/www/admin/regex-edit.php
@@ -63,4 +63,3 @@ $page->smarty->assign('catlist',$category->getForSelect(true));
 
 $page->content = $page->smarty->fetch('regex-edit.tpl');
 $page->render();
-
diff --git a/www/themes/charisma/templates/frontend/books.tpl b/www/themes/charisma/templates/frontend/books.tpl
index fb3c39f01..3aeabee8e 100644
--- a/www/themes/charisma/templates/frontend/books.tpl
+++ b/www/themes/charisma/templates/frontend/books.tpl
@@ -151,7 +151,7 @@
 																	<div>
 																		<a role="button" class="btn btn-default btn-xs"
 																		   href="{$smarty.const.WWW_TOP}/getnzb/{$mguid[$m@index]}|escape:"htmlall"}"><i
-																					class="fa fa-download"></i><span
+																					class="fa fa-cloud-download"></i><span
 																					class="badge">{$mgrabs[$m@index]}
 																				Grab{if $mgrabs[$m@index] != 1}s{/if}</span></a>
 																		<a role="button" class="btn btn-default btn-xs"
diff --git a/www/themes/charisma/templates/frontend/browse.tpl b/www/themes/charisma/templates/frontend/browse.tpl
index ecdaa0e28..74a02457a 100644
--- a/www/themes/charisma/templates/frontend/browse.tpl
+++ b/www/themes/charisma/templates/frontend/browse.tpl
@@ -124,7 +124,7 @@
 									<td>{$result.size|fsize_format:"MB"}</td>
 									<td class="icon_nzb"><a
 												href="{$smarty.const.WWW_TOP}/getnzb/{$result.guid}/{$result.searchname|escape:"htmlall"}"><i
-													class="fa fa-download text-muted"
+													class="fa fa-cloud-download text-muted"
 													title="Download NZB"></i></a>
 										<a href="{$smarty.const.WWW_TOP}/details/{$result.guid}/#comments"><i
 													class="fa fa-comments-o text-muted"
@@ -132,12 +132,12 @@
 										<a href="#" class="icon_cart text-muted"><i
 													class="fa fa-shopping-basket" title="Send to my Cart"></i></a>
 										{if isset($sabintegrated)}
-											<a href="#" class="icon_sab text-muted"><i class="fa fa-send-o"
+											<a href="#" class="icon_sab text-muted"><i class="fa fa-share"
 																					   title="Send to my Queue"></i></a>
 										{/if}
 										{if $weHasVortex}
 											<a href="#" class="icon_vortex text-muted"><i
-														class="fa fa-send-o" title="Send to NZBVortex"></i></a>
+														class="fa fa-share" title="Send to NZBVortex"></i></a>
 										{/if}
 									</td>
 								</tr>
diff --git a/www/themes/charisma/templates/frontend/console.tpl b/www/themes/charisma/templates/frontend/console.tpl
index c912c1e56..53e646ea1 100644
--- a/www/themes/charisma/templates/frontend/console.tpl
+++ b/www/themes/charisma/templates/frontend/console.tpl
@@ -175,7 +175,7 @@
 															<div>
 																<a role="button" class="btn btn-default btn-xs"
 																   href="{$smarty.const.WWW_TOP}/getnzb/{$mguid[$m@index]}|escape:"htmlall"}"><i
-																			class="fa fa-download"></i><span
+																			class="fa fa-cloud-download"></i><span
 																			class="badge">{$mgrabs[$m@index]}
 																		Grab{if $mgrabs[$m@index] != 1}s{/if}</span></a>
 																<a role="button" class="btn btn-default btn-xs"
diff --git a/www/themes/charisma/templates/frontend/games.tpl b/www/themes/charisma/templates/frontend/games.tpl
index efbf1ae6a..c6fcc492b 100644
--- a/www/themes/charisma/templates/frontend/games.tpl
+++ b/www/themes/charisma/templates/frontend/games.tpl
@@ -192,7 +192,7 @@
 															<div>
 																<a role="button" class="btn btn-default btn-xs"
 																   href="{$smarty.const.WWW_TOP}/getnzb/{$mguid[$m@index]}|escape:"htmlall"}"><i
-																			class="fa fa-download"></i><span
+																			class="fa fa-cloud-download"></i><span
 																			class="badge">{$mgrabs[$m@index]}
 																		Grab{if $mgrabs[$m@index] != 1}s{/if}</span></a>
 																<a role="button" class="btn btn-default btn-xs"
diff --git a/www/themes/charisma/templates/frontend/movies.tpl b/www/themes/charisma/templates/frontend/movies.tpl
index e8ec13c0b..a51a6aa35 100644
--- a/www/themes/charisma/templates/frontend/movies.tpl
+++ b/www/themes/charisma/templates/frontend/movies.tpl
@@ -193,7 +193,7 @@
 														<div>
 															<a role="button" class="btn btn-default btn-xs"
 															   href="{$smarty.const.WWW_TOP}/getnzb/{$mguid[$m@index]}|escape:"htmlall"}"><i
-																		class="fa fa-download"></i><span
+																		class="fa fa-cloud-download"></i><span
 																		class="badge"> {$mgrabs[$m@index]}
 																	Grab{if $mgrabs[$m@index] != 1}s{/if}</span></a>
 															<a role="button" class="btn btn-default btn-xs"
@@ -216,7 +216,7 @@
 																	  rel="{$cpurl}/api/{$cpapi}/movie.add/?identifier=tt{$result.imdbid}&title={$result.title}"
 																	  name="CP{$result.imdbid}"
 																	  title="Add to CouchPotato"
-																		><i class="fa fa-send-o"></i></span>
+																		><i class="fa fa-share"></i></span>
 															{/if}
 															{if $mfailed[$m@index] > 0}
 																<span class="btn btn-default btn-xs" title="This release has failed to download for some users">
@@ -311,7 +311,7 @@
 														<div>
 															<a role="button" class="btn btn-default btn-xs"
 															   href="{$smarty.const.WWW_TOP}/getnzb/{$mguid[$m@index]}|escape:"htmlall"}"><i
-																		class="fa fa-download"></i><span
+																		class="fa fa-cloud-download"></i><span
 																		class="badge"> {$mgrabs[$m@index]}
 																	Grab{if $mgrabs[$m@index] != 1}s{/if}</span></a>
 															<a role="button" class="btn btn-default btn-xs"
@@ -334,7 +334,7 @@
 																		rel="{$cpurl}/api/{$cpapi}/movie.add/?identifier=tt{$result.imdbid}&title={$result.title}"
 																		name="CP{$result.imdbid}"
 																		title="Add to CouchPotato"
-																		><i class="fa fa-send-o"></i></span>
+																		><i class="fa fa-share"></i></span>
 															{/if}
 															{if $mfailed[$m@index] > 0}
 																<span class="btn btn-default btn-xs" title="This release has failed to download for some users">
diff --git a/www/themes/charisma/templates/frontend/music.tpl b/www/themes/charisma/templates/frontend/music.tpl
index c5634e217..babc4d601 100644
--- a/www/themes/charisma/templates/frontend/music.tpl
+++ b/www/themes/charisma/templates/frontend/music.tpl
@@ -177,7 +177,7 @@
 															<div>
 																<a role="button" class="btn btn-default btn-xs"
 																   href="{$smarty.const.WWW_TOP}/getnzb/{$mguid[$m@index]}|escape:"htmlall"}"><i
-																			class="fa fa-download"></i><span
+																			class="fa fa-cloud-download"></i><span
 																			class="badge">{$mgrabs[$m@index]}
 																		Grab{if $mgrabs[$m@index] != 1}s{/if}</span></a>
 																<a role="button" class="btn btn-default btn-xs"
diff --git a/www/themes/charisma/templates/frontend/mymovielist.tpl b/www/themes/charisma/templates/frontend/mymovielist.tpl
index 06389d6cf..e78bfc891 100644
--- a/www/themes/charisma/templates/frontend/mymovielist.tpl
+++ b/www/themes/charisma/templates/frontend/mymovielist.tpl
@@ -32,7 +32,7 @@
 						<br/>
 						{if $ourmovies[$result['imdb_id']] != ""}<a class="btn btn-sm btn-default"
 																	href="{$smarty.const.WWW_TOP}/movies?imdb={$result['imdb_id']}">
-								Download <i class="fa fa-download"></i></a>{/if}
+								Download <i class="fa fa-cloud-download"></i></a>{/if}
 						<a style="display:{if $userimdbs[$result['imdb_id']] == ""}inline{else}none;{/if}"
 						   onclick="mymovie_add('{$result['imdb_id']}', this);return false;"
 						   class="btn btn-sm btn-success" href="#">Add To My Movies</a>
@@ -46,4 +46,4 @@
 	</table>
 {else}
 	<h2>No results</h2>
-{/if}
\ No newline at end of file
+{/if}
diff --git a/www/themes/charisma/templates/frontend/profileedit.tpl b/www/themes/charisma/templates/frontend/profileedit.tpl
index 3127a34d6..9a203a0f2 100644
--- a/www/themes/charisma/templates/frontend/profileedit.tpl
+++ b/www/themes/charisma/templates/frontend/profileedit.tpl
@@ -20,7 +20,7 @@
 							<ul class="nav nav-tabs nav-primary">
 								<li class="active"><a href="#tab2_1" data-toggle="tab"><i class="fa fa-cogs fa-spin"></i>
 										Settings</a></li>
-								<li><a href="#tab2_3" data-toggle="tab"><i class="fa fa-download"></i> Downloaders</a>
+								<li><a href="#tab2_3" data-toggle="tab"><i class="fa fa-cloud-download"></i> Downloaders</a>
 								</li>
 							</ul>
 							<form action="profileedit?action=submit" method="post">
@@ -344,4 +344,4 @@
 			</div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/www/themes/charisma/templates/frontend/search.tpl b/www/themes/charisma/templates/frontend/search.tpl
index ee0af84fd..487a36a95 100644
--- a/www/themes/charisma/templates/frontend/search.tpl
+++ b/www/themes/charisma/templates/frontend/search.tpl
@@ -328,7 +328,7 @@
 					</td>
 					<td class="icon_nzb"><a
 								href="{$smarty.const.WWW_TOP}/getnzb/{$result.guid}/{$result.searchname|escape:"htmlall"}"><i
-									class="fa fa-download text-muted"
+									class="fa fa-cloud-download text-muted"
 									title="Download NZB"></i></a>
 						<a href="{$smarty.const.WWW_TOP}/details/{$result.guid}/#comments"><i
 									class="fa fa-comments-o text-muted"
@@ -336,12 +336,12 @@
 						<a href="#" class="icon_cart text-muted"><i
 									class="fa fa-shopping-basket" title="Send to my Cart"></i></a>
 						{if isset($sabintegrated)}
-							<a href="#" class="icon_sab text-muted"><i class="fa fa-send-o"
+							<a href="#" class="icon_sab text-muted"><i class="fa fa-share"
 																	   title="Send to my Queue"></i></a>
 						{/if}
 						{if $weHasVortex}
 							<a href="#" class="icon_vortex text-muted"><i
-										class="fa fa-send-o" title="Send to NZBVortex"></i></a>
+										class="fa fa-share" title="Send to NZBVortex"></i></a>
 						{/if}
 					</td>
 				</tr>
diff --git a/www/themes/charisma/templates/frontend/viewanime.tpl b/www/themes/charisma/templates/frontend/viewanime.tpl
index 20c363e12..1f3c7bf9c 100644
--- a/www/themes/charisma/templates/frontend/viewanime.tpl
+++ b/www/themes/charisma/templates/frontend/viewanime.tpl
@@ -122,7 +122,7 @@
 									<td>{$result.size|fsize_format:"MB"}</td>
 									<td class="icon_nzb"><a
 												href="{$smarty.const.WWW_TOP}/getnzb/{$result.guid}/{$result.animeTitle|escape:"htmlall"}"><i
-													class="fa fa-download text-muted"
+													class="fa fa-cloud-download text-muted"
 													title="Download NZB"></i></a>
 										<a href="{$smarty.const.WWW_TOP}/details/{$result.guid}/#comments"><i
 													class="fa fa-comments-o text-muted"
@@ -130,16 +130,16 @@
 										<a href="#" class="icon_cart text-muted"><i
 													class="fa fa-shopping-basket" title="Send to my Cart"></i></a>
 										{if isset($sabintegrated)}
-											<a href="#" class="icon_sab text-muted"><i class="fa fa-send-o"
+											<a href="#" class="icon_sab text-muted"><i class="fa fa-share"
 																					   title="Send to my Queue"></i></a>
 										{/if}
 										{if $weHasVortex}
 											<a href="#" class="icon_vortex text-muted"><i
-														class="fa fa-send-o" title="Send to NZBVortex"></i></a>
+														class="fa fa-share" title="Send to NZBVortex"></i></a>
 										{/if}
 									</td>
 								</tr>
 							{/foreach}
 					</table>
 </form>
-{/if}
\ No newline at end of file
+{/if}
diff --git a/www/themes/charisma/templates/frontend/viewmoviefull.tpl b/www/themes/charisma/templates/frontend/viewmoviefull.tpl
index 3d4bc42c4..38231ec61 100644
--- a/www/themes/charisma/templates/frontend/viewmoviefull.tpl
+++ b/www/themes/charisma/templates/frontend/viewmoviefull.tpl
@@ -172,7 +172,7 @@
 											<td class="icons">
 												<a title="Download NZB"
 												   href="{$smarty.const.WWW_TOP}/getnzb/{$mguid[$m@index]}"><i
-															class="icon icon_nzb fa fa-download text-muted"></i></a>
+															class="icon icon_nzb fa fa-cloud-download text-muted"></i></a>
 												<a href="#" class="icon_cart text-muted"><i class="fa fa-shopping-basket"
 																							title="Add to Cart"></i></a>
 												{if isset($sabintegrated)}<img class="icon_sab"
diff --git a/www/themes/charisma/templates/frontend/viewnzb.tpl b/www/themes/charisma/templates/frontend/viewnzb.tpl
index 7623fdd6a..8d66f4af2 100644
--- a/www/themes/charisma/templates/frontend/viewnzb.tpl
+++ b/www/themes/charisma/templates/frontend/viewnzb.tpl
@@ -224,7 +224,7 @@
 												<div class="btn-group btn-group-vertical">
 													<a class="btn btn-primary btn-sm btn-success btn-transparent"
 													   href="{$smarty.const.WWW_TOP}/getnzb/{$release.guid}/{$release.searchname|escape:"htmlall"}"><i
-																class="fa fa-download"></i>
+																class="fa fa-cloud-download"></i>
 														Download</a>
 													<button type="button"
 															class="btn btn-primary btn-sm btn-info btn-transparent cartadd">
diff --git a/www/themes/charisma/templates/frontend/viewseries.tpl b/www/themes/charisma/templates/frontend/viewseries.tpl
index 8d4374b39..a4d87100d 100644
--- a/www/themes/charisma/templates/frontend/viewseries.tpl
+++ b/www/themes/charisma/templates/frontend/viewseries.tpl
@@ -201,13 +201,13 @@
 														<td class="icons" style='width:100px;'>
 															<a title="Download Nzb"
 															   href="{$smarty.const.WWW_TOP}/getnzb/{$result.guid}"><i
-																		class="fa fa-download text-muted"></i></a>
+																		class="fa fa-cloud-download text-muted"></i></a>
 															<a class="fa fa-shopping-basket icon_cart text-muted"
 															   href="#"
 															   title="Add to Cart">
 															</a>
 															{if isset($sabintegrated)}
-																<a class="fa fa-send-o icon_sab text-muted"
+																<a class="fa fa-share icon_sab text-muted"
 																   href="#"
 																   title="Send to my Queue">
 																</a>
diff --git a/www/themes/charisma/templates/frontend/xxx.tpl b/www/themes/charisma/templates/frontend/xxx.tpl
index 3fb9515fb..17d16deed 100644
--- a/www/themes/charisma/templates/frontend/xxx.tpl
+++ b/www/themes/charisma/templates/frontend/xxx.tpl
@@ -222,7 +222,7 @@
 														<div>
 															<a role="button" class="btn btn-default btn-xs"
 															   href="{$smarty.const.WWW_TOP}/getnzb/{$mguid[$m@index]}|escape:"htmlall"}"><i
-																		class="fa fa-download"></i><span
+																		class="fa fa-cloud-download"></i><span
 																		class="badge"> {$mgrabs[$m@index]}
 																	Grab{if $mgrabs[$m@index] != 1}s{/if}</span></a>
 															<a role="button" class="btn btn-default btn-xs"
@@ -374,7 +374,7 @@
 														<div>
 															<a role="button" class="btn btn-default btn-xs"
 															   href="{$smarty.const.WWW_TOP}/getnzb/{$mguid[$m@index]}|escape:"htmlall"}"><i
-																		class="fa fa-download"></i><span
+																		class="fa fa-cloud-download"></i><span
 																		class="badge"> {$mgrabs[$m@index]}
 																	Grab{if $mgrabs[$m@index] != 1}s{/if}</span></a>
 															<a role="button" class="btn btn-default btn-xs"
diff --git a/www/themes/omicron/templates/frontend/books.tpl b/www/themes/omicron/templates/frontend/books.tpl
index fb3c39f01..3aeabee8e 100644
--- a/www/themes/omicron/templates/frontend/books.tpl
+++ b/www/themes/omicron/templates/frontend/books.tpl
@@ -151,7 +151,7 @@
 																	<div>
 																		<a role="button" class="btn btn-default btn-xs"
 																		   href="{$smarty.const.WWW_TOP}/getnzb/{$mguid[$m@index]}|escape:"htmlall"}"><i
-																					class="fa fa-download"></i><span
+																					class="fa fa-cloud-download"></i><span
 																					class="badge">{$mgrabs[$m@index]}
 																				Grab{if $mgrabs[$m@index] != 1}s{/if}</span></a>
 																		<a role="button" class="btn btn-default btn-xs"
diff --git a/www/themes/omicron/templates/frontend/browse.tpl b/www/themes/omicron/templates/frontend/browse.tpl
index ecdaa0e28..74a02457a 100644
--- a/www/themes/omicron/templates/frontend/browse.tpl
+++ b/www/themes/omicron/templates/frontend/browse.tpl
@@ -124,7 +124,7 @@
 									<td>{$result.size|fsize_format:"MB"}</td>
 									<td class="icon_nzb"><a
 												href="{$smarty.const.WWW_TOP}/getnzb/{$result.guid}/{$result.searchname|escape:"htmlall"}"><i
-													class="fa fa-download text-muted"
+													class="fa fa-cloud-download text-muted"
 													title="Download NZB"></i></a>
 										<a href="{$smarty.const.WWW_TOP}/details/{$result.guid}/#comments"><i
 													class="fa fa-comments-o text-muted"
@@ -132,12 +132,12 @@
 										<a href="#" class="icon_cart text-muted"><i
 													class="fa fa-shopping-basket" title="Send to my Cart"></i></a>
 										{if isset($sabintegrated)}
-											<a href="#" class="icon_sab text-muted"><i class="fa fa-send-o"
+											<a href="#" class="icon_sab text-muted"><i class="fa fa-share"
 																					   title="Send to my Queue"></i></a>
 										{/if}
 										{if $weHasVortex}
 											<a href="#" class="icon_vortex text-muted"><i
-														class="fa fa-send-o" title="Send to NZBVortex"></i></a>
+														class="fa fa-share" title="Send to NZBVortex"></i></a>
 										{/if}
 									</td>
 								</tr>
diff --git a/www/themes/omicron/templates/frontend/console.tpl b/www/themes/omicron/templates/frontend/console.tpl
index c912c1e56..53e646ea1 100644
--- a/www/themes/omicron/templates/frontend/console.tpl
+++ b/www/themes/omicron/templates/frontend/console.tpl
@@ -175,7 +175,7 @@
 															<div>
 																<a role="button" class="btn btn-default btn-xs"
 																   href="{$smarty.const.WWW_TOP}/getnzb/{$mguid[$m@index]}|escape:"htmlall"}"><i
-																			class="fa fa-download"></i><span
+																			class="fa fa-cloud-download"></i><span
 																			class="badge">{$mgrabs[$m@index]}
 																		Grab{if $mgrabs[$m@index] != 1}s{/if}</span></a>
 																<a role="button" class="btn btn-default btn-xs"
diff --git a/www/themes/omicron/templates/frontend/games.tpl b/www/themes/omicron/templates/frontend/games.tpl
index efbf1ae6a..c6fcc492b 100644
--- a/www/themes/omicron/templates/frontend/games.tpl
+++ b/www/themes/omicron/templates/frontend/games.tpl
@@ -192,7 +192,7 @@
 															<div>
 																<a role="button" class="btn btn-default btn-xs"
 																   href="{$smarty.const.WWW_TOP}/getnzb/{$mguid[$m@index]}|escape:"htmlall"}"><i
-																			class="fa fa-download"></i><span
+																			class="fa fa-cloud-download"></i><span
 																			class="badge">{$mgrabs[$m@index]}
 																		Grab{if $mgrabs[$m@index] != 1}s{/if}</span></a>
 																<a role="button" class="btn btn-default btn-xs"
diff --git a/www/themes/omicron/templates/frontend/movies.tpl b/www/themes/omicron/templates/frontend/movies.tpl
index e8ec13c0b..a51a6aa35 100644
--- a/www/themes/omicron/templates/frontend/movies.tpl
+++ b/www/themes/omicron/templates/frontend/movies.tpl
@@ -193,7 +193,7 @@
 														<div>
 															<a role="button" class="btn btn-default btn-xs"
 															   href="{$smarty.const.WWW_TOP}/getnzb/{$mguid[$m@index]}|escape:"htmlall"}"><i
-																		class="fa fa-download"></i><span
+																		class="fa fa-cloud-download"></i><span
 																		class="badge"> {$mgrabs[$m@index]}
 																	Grab{if $mgrabs[$m@index] != 1}s{/if}</span></a>
 															<a role="button" class="btn btn-default btn-xs"
@@ -216,7 +216,7 @@
 																	  rel="{$cpurl}/api/{$cpapi}/movie.add/?identifier=tt{$result.imdbid}&title={$result.title}"
 																	  name="CP{$result.imdbid}"
 																	  title="Add to CouchPotato"
-																		><i class="fa fa-send-o"></i></span>
+																		><i class="fa fa-share"></i></span>
 															{/if}
 															{if $mfailed[$m@index] > 0}
 																<span class="btn btn-default btn-xs" title="This release has failed to download for some users">
@@ -311,7 +311,7 @@
 														<div>
 															<a role="button" class="btn btn-default btn-xs"
 															   href="{$smarty.const.WWW_TOP}/getnzb/{$mguid[$m@index]}|escape:"htmlall"}"><i
-																		class="fa fa-download"></i><span
+																		class="fa fa-cloud-download"></i><span
 																		class="badge"> {$mgrabs[$m@index]}
 																	Grab{if $mgrabs[$m@index] != 1}s{/if}</span></a>
 															<a role="button" class="btn btn-default btn-xs"
@@ -334,7 +334,7 @@
 																		rel="{$cpurl}/api/{$cpapi}/movie.add/?identifier=tt{$result.imdbid}&title={$result.title}"
 																		name="CP{$result.imdbid}"
 																		title="Add to CouchPotato"
-																		><i class="fa fa-send-o"></i></span>
+																		><i class="fa fa-share"></i></span>
 															{/if}
 															{if $mfailed[$m@index] > 0}
 																<span class="btn btn-default btn-xs" title="This release has failed to download for some users">
diff --git a/www/themes/omicron/templates/frontend/music.tpl b/www/themes/omicron/templates/frontend/music.tpl
index c5634e217..babc4d601 100644
--- a/www/themes/omicron/templates/frontend/music.tpl
+++ b/www/themes/omicron/templates/frontend/music.tpl
@@ -177,7 +177,7 @@
 															<div>
 																<a role="button" class="btn btn-default btn-xs"
 																   href="{$smarty.const.WWW_TOP}/getnzb/{$mguid[$m@index]}|escape:"htmlall"}"><i
-																			class="fa fa-download"></i><span
+																			class="fa fa-cloud-download"></i><span
 																			class="badge">{$mgrabs[$m@index]}
 																		Grab{if $mgrabs[$m@index] != 1}s{/if}</span></a>
 																<a role="button" class="btn btn-default btn-xs"
diff --git a/www/themes/omicron/templates/frontend/mymovielist.tpl b/www/themes/omicron/templates/frontend/mymovielist.tpl
index ce44a3618..80a4393b2 100644
--- a/www/themes/omicron/templates/frontend/mymovielist.tpl
+++ b/www/themes/omicron/templates/frontend/mymovielist.tpl
@@ -32,7 +32,7 @@
 						<br/>
 						{if $ourmovies[$result['imdb_id']] != ""}<a class="btn btn-sm btn-default"
 																	href="{$smarty.const.WWW_TOP}/movies?imdb={$result['imdb_id']}">
-								Download <i class="fa fa-download"></i></a>{/if}
+								Download <i class="fa fa-cloud-download"></i></a>{/if}
 						<a style="display:{if $userimdbs[$result['imdb_id']] == ""}inline{else}none;{/if}"
 						   onclick="mymovie_add('{$result['imdb_id']}', this);return false;"
 						   class="btn btn-sm btn-success" href="#">Add To My Movies</a>
@@ -46,4 +46,4 @@
 	</table>
 {else}
 	<h2>No results</h2>
-{/if}
\ No newline at end of file
+{/if}
diff --git a/www/themes/omicron/templates/frontend/profileedit.tpl b/www/themes/omicron/templates/frontend/profileedit.tpl
index 6ed845c61..827b7bd97 100644
--- a/www/themes/omicron/templates/frontend/profileedit.tpl
+++ b/www/themes/omicron/templates/frontend/profileedit.tpl
@@ -20,7 +20,7 @@
 							<ul class="nav nav-tabs nav-primary">
 								<li class="active"><a href="#tab2_1" data-toggle="tab"><i class="fa fa-cogs fa-spin"></i>
 										Settings</a></li>
-								<li><a href="#tab2_3" data-toggle="tab"><i class="fa fa-download"></i> Downloaders</a>
+								<li><a href="#tab2_3" data-toggle="tab"><i class="fa fa-cloud-download"></i> Downloaders</a>
 								</li>
 							</ul>
 							<form action="profileedit?action=submit" method="post">
@@ -318,4 +318,4 @@
 			</div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/www/themes/omicron/templates/frontend/search.tpl b/www/themes/omicron/templates/frontend/search.tpl
index ee0af84fd..487a36a95 100644
--- a/www/themes/omicron/templates/frontend/search.tpl
+++ b/www/themes/omicron/templates/frontend/search.tpl
@@ -328,7 +328,7 @@
 					</td>
 					<td class="icon_nzb"><a
 								href="{$smarty.const.WWW_TOP}/getnzb/{$result.guid}/{$result.searchname|escape:"htmlall"}"><i
-									class="fa fa-download text-muted"
+									class="fa fa-cloud-download text-muted"
 									title="Download NZB"></i></a>
 						<a href="{$smarty.const.WWW_TOP}/details/{$result.guid}/#comments"><i
 									class="fa fa-comments-o text-muted"
@@ -336,12 +336,12 @@
 						<a href="#" class="icon_cart text-muted"><i
 									class="fa fa-shopping-basket" title="Send to my Cart"></i></a>
 						{if isset($sabintegrated)}
-							<a href="#" class="icon_sab text-muted"><i class="fa fa-send-o"
+							<a href="#" class="icon_sab text-muted"><i class="fa fa-share"
 																	   title="Send to my Queue"></i></a>
 						{/if}
 						{if $weHasVortex}
 							<a href="#" class="icon_vortex text-muted"><i
-										class="fa fa-send-o" title="Send to NZBVortex"></i></a>
+										class="fa fa-share" title="Send to NZBVortex"></i></a>
 						{/if}
 					</td>
 				</tr>
diff --git a/www/themes/omicron/templates/frontend/viewanime.tpl b/www/themes/omicron/templates/frontend/viewanime.tpl
index 20c363e12..1f3c7bf9c 100644
--- a/www/themes/omicron/templates/frontend/viewanime.tpl
+++ b/www/themes/omicron/templates/frontend/viewanime.tpl
@@ -122,7 +122,7 @@
 									<td>{$result.size|fsize_format:"MB"}</td>
 									<td class="icon_nzb"><a
 												href="{$smarty.const.WWW_TOP}/getnzb/{$result.guid}/{$result.animeTitle|escape:"htmlall"}"><i
-													class="fa fa-download text-muted"
+													class="fa fa-cloud-download text-muted"
 													title="Download NZB"></i></a>
 										<a href="{$smarty.const.WWW_TOP}/details/{$result.guid}/#comments"><i
 													class="fa fa-comments-o text-muted"
@@ -130,16 +130,16 @@
 										<a href="#" class="icon_cart text-muted"><i
 													class="fa fa-shopping-basket" title="Send to my Cart"></i></a>
 										{if isset($sabintegrated)}
-											<a href="#" class="icon_sab text-muted"><i class="fa fa-send-o"
+											<a href="#" class="icon_sab text-muted"><i class="fa fa-share"
 																					   title="Send to my Queue"></i></a>
 										{/if}
 										{if $weHasVortex}
 											<a href="#" class="icon_vortex text-muted"><i
-														class="fa fa-send-o" title="Send to NZBVortex"></i></a>
+														class="fa fa-share" title="Send to NZBVortex"></i></a>
 										{/if}
 									</td>
 								</tr>
 							{/foreach}
 					</table>
 </form>
-{/if}
\ No newline at end of file
+{/if}
diff --git a/www/themes/omicron/templates/frontend/viewmoviefull.tpl b/www/themes/omicron/templates/frontend/viewmoviefull.tpl
index 80535f756..d78f66f60 100644
--- a/www/themes/omicron/templates/frontend/viewmoviefull.tpl
+++ b/www/themes/omicron/templates/frontend/viewmoviefull.tpl
@@ -172,7 +172,7 @@
 											<td class="icons">
 												<a title="Download NZB"
 												   href="{$smarty.const.WWW_TOP}/getnzb/{$mguid[$m@index]}"><i
-															class="icon icon_nzb fa fa-download text-muted"></i></a>
+															class="icon icon_nzb fa fa-cloud-download text-muted"></i></a>
 												<a href="#" class="icon_cart text-muted"><i class="fa fa-shopping-basket"
 																							title="Add to Cart"></i></a>
 												{if isset($sabintegrated)}<img class="icon_sab"
diff --git a/www/themes/omicron/templates/frontend/viewnzb.tpl b/www/themes/omicron/templates/frontend/viewnzb.tpl
index 7623fdd6a..8d66f4af2 100644
--- a/www/themes/omicron/templates/frontend/viewnzb.tpl
+++ b/www/themes/omicron/templates/frontend/viewnzb.tpl
@@ -224,7 +224,7 @@
 												<div class="btn-group btn-group-vertical">
 													<a class="btn btn-primary btn-sm btn-success btn-transparent"
 													   href="{$smarty.const.WWW_TOP}/getnzb/{$release.guid}/{$release.searchname|escape:"htmlall"}"><i
-																class="fa fa-download"></i>
+																class="fa fa-cloud-download"></i>
 														Download</a>
 													<button type="button"
 															class="btn btn-primary btn-sm btn-info btn-transparent cartadd">
diff --git a/www/themes/omicron/templates/frontend/viewseries.tpl b/www/themes/omicron/templates/frontend/viewseries.tpl
index 8d4374b39..a4d87100d 100644
--- a/www/themes/omicron/templates/frontend/viewseries.tpl
+++ b/www/themes/omicron/templates/frontend/viewseries.tpl
@@ -201,13 +201,13 @@
 														<td class="icons" style='width:100px;'>
 															<a title="Download Nzb"
 															   href="{$smarty.const.WWW_TOP}/getnzb/{$result.guid}"><i
-																		class="fa fa-download text-muted"></i></a>
+																		class="fa fa-cloud-download text-muted"></i></a>
 															<a class="fa fa-shopping-basket icon_cart text-muted"
 															   href="#"
 															   title="Add to Cart">
 															</a>
 															{if isset($sabintegrated)}
-																<a class="fa fa-send-o icon_sab text-muted"
+																<a class="fa fa-share icon_sab text-muted"
 																   href="#"
 																   title="Send to my Queue">
 																</a>
diff --git a/www/themes/omicron/templates/frontend/xxx.tpl b/www/themes/omicron/templates/frontend/xxx.tpl
index 3fb9515fb..17d16deed 100644
--- a/www/themes/omicron/templates/frontend/xxx.tpl
+++ b/www/themes/omicron/templates/frontend/xxx.tpl
@@ -222,7 +222,7 @@
 														<div>
 															<a role="button" class="btn btn-default btn-xs"
 															   href="{$smarty.const.WWW_TOP}/getnzb/{$mguid[$m@index]}|escape:"htmlall"}"><i
-																		class="fa fa-download"></i><span
+																		class="fa fa-cloud-download"></i><span
 																		class="badge"> {$mgrabs[$m@index]}
 																	Grab{if $mgrabs[$m@index] != 1}s{/if}</span></a>
 															<a role="button" class="btn btn-default btn-xs"
@@ -374,7 +374,7 @@
 														<div>
 															<a role="button" class="btn btn-default btn-xs"
 															   href="{$smarty.const.WWW_TOP}/getnzb/{$mguid[$m@index]}|escape:"htmlall"}"><i
-																		class="fa fa-download"></i><span
+																		class="fa fa-cloud-download"></i><span
 																		class="badge"> {$mgrabs[$m@index]}
 																	Grab{if $mgrabs[$m@index] != 1}s{/if}</span></a>
 															<a role="button" class="btn btn-default btn-xs"