diff --git a/src/Icons/oxygen/insert-link.png b/src/Icons/oxygen/insert-link.png
new file mode 100644
index 000000000..1347a931a
Binary files /dev/null and b/src/Icons/oxygen/insert-link.png differ
diff --git a/src/Icons/skin/open.png b/src/Icons/skin/open.png
deleted file mode 100644
index f7fdb5d3c..000000000
Binary files a/src/Icons/skin/open.png and /dev/null differ
diff --git a/src/Icons/skin/url.png b/src/Icons/skin/url.png
deleted file mode 100644
index 3995aab8a..000000000
Binary files a/src/Icons/skin/url.png and /dev/null differ
diff --git a/src/icons.qrc b/src/icons.qrc
index 3cf7f1b17..008bb082e 100644
--- a/src/icons.qrc
+++ b/src/icons.qrc
@@ -17,7 +17,6 @@
   <file>Icons/skin/tabs.gif</file>
   <file>Icons/skin/qbittorrent16.png</file>
   <file>Icons/skin/connected.png</file>
-  <file>Icons/skin/url.png</file>
   <file>Icons/skin/qbittorrent22.png</file>
   <file>Icons/skin/disconnected.png</file>
   <file>Icons/skin/mascot.png</file>
@@ -29,7 +28,6 @@
   <file>Icons/skin/handle-icon-horizontal.gif</file>
   <file>Icons/skin/qbittorrent32.png</file>
   <file>Icons/skin/knob.gif</file>
-  <file>Icons/skin/open.png</file>
   <file>Icons/skin/filterall.png</file>
   <file>Icons/skin/uploading.png</file>
   <file>Icons/skin/queued.png</file>
@@ -295,6 +293,7 @@
   <file>Icons/oxygen/edit-clear-history.png</file>
   <file>Icons/oxygen/edit-copy.png</file>
   <file>Icons/oxygen/folder-documents.png</file>
+  <file>Icons/oxygen/insert-link.png</file>
   <file>Icons/oxygen/network-wired.png</file>
   <file>Icons/oxygen/mail-mark-read.png</file>
   <file>Icons/oxygen/go-up.png</file>
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index dc233afa1..4c939b409 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -101,8 +101,8 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo
   connect(static_cast<SessionApplication*>(qApp), SIGNAL(sessionIsShuttingDown()), this, SLOT(deleteBTSession()));
   // Setting icons
   this->setWindowIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png")));
-  actionOpen->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/open.png"))); // FIXME
-  actionDownload_from_URL->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/url.png"))); // FIXME
+  actionOpen->setIcon(misc::getIcon("list-add"));
+  actionDownload_from_URL->setIcon(misc::getIcon("insert-link"));
   actionSet_upload_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png")));
   actionSet_download_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/download.png")));
   actionSet_global_upload_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png")));
@@ -122,7 +122,7 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo
   actionPause_All->setIcon(misc::getIcon("media-playback-pause"));
   actionStart->setIcon(misc::getIcon("media-playback-start"));
   actionStart_All->setIcon(misc::getIcon("media-playback-start"));
-  action_Import_Torrent->setIcon(misc::getIcon("list-add"));
+  action_Import_Torrent->setIcon(misc::getIcon("document-import"));
   actionShow_console->setIcon(misc::getIcon("view-calendar-journal"));
 
   QMenu *startAllMenu = new QMenu(this);
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 2c806b272..9b5b77ae7 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -123,7 +123,6 @@
     <bool>false</bool>
    </attribute>
    <addaction name="actionOpen"/>
-   <addaction name="actionDownload_from_URL"/>
    <addaction name="separator"/>
    <addaction name="actionDelete"/>
    <addaction name="separator"/>
diff --git a/src/webui/html/index.html b/src/webui/html/index.html
index 134771b7f..7de33792d 100644
--- a/src/webui/html/index.html
+++ b/src/webui/html/index.html
@@ -35,8 +35,8 @@
 					<li>
 						<a class="returnFalse">_(File)</a>
 						<ul>
-							<li><a id="uploadLink"><img class="MyMenuIcon" alt="_(Download local torrent)" src="images/skin/open.png" width="16" height="16" onload="fixPNG(this)"/>_(&Add File...)</a></li>
-							<li><a id="downloadLink"><img class="MyMenuIcon" alt="_(Download local torrent)" src="images/skin/url.png" width="16" height="16" onload="fixPNG(this)"/>_(Add &URL...)</a></li>
+							<li><a id="uploadLink"><img class="MyMenuIcon" src="theme/list-add" width="16" height="16" onload="fixPNG(this)"/>_(&Add File...)</a></li>
+							<li><a id="downloadLink"><img class="MyMenuIcon" src="theme/insert-link" width="16" height="16" onload="fixPNG(this)"/>_(Add &URL...)</a></li>
 						  
 						</ul>
 					</li>
@@ -70,8 +70,8 @@
 				</ul>
 			</div>
 			<div id="mochaToolbar">
-				<a id="uploadButton"><img class="mochaToolButton" title="_(Download local torrent)" src="images/skin/open.png" width="32" height="32" onload="fixPNG(this)"/></a>
-				<a id="downloadButton"><img class="mochaToolButton" title="_(Download from URL)" src="images/skin/url.png" width="32" height="32" onload="fixPNG(this)"/></a>
+				<a id="uploadButton"><img class="mochaToolButton" title="_(Download local torrent)" src="theme/list-add" width="32" height="32" onload="fixPNG(this)"/></a>
+				<a id="downloadButton"><img class="mochaToolButton" title="_(Download from URL)" src="theme/insert-link" width="32" height="32" onload="fixPNG(this)"/></a>
 			  <a id="deleteButton" class="divider"><img class="mochaToolButton" title="_(Delete)" src="theme/edit-delete" width="32" height="32" onload="fixPNG(this)"/></a>
 			  <a id="deletePermButton"><img class="mochaToolButton" title="_(Delete from HD)" src="images/skin/delete_perm.png" width="32" height="32" onload="fixPNG(this)"/></a>
 				<a id="resumeButton" class="divider"><img class="mochaToolButton" title="_(Start)" src="theme/media-playback-start" width="32" height="32" onload="fixPNG(this)"/></a>