diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
index 90860ff2c..03837514e 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
@@ -72,7 +72,7 @@
 #define IMAGE_COLLMODIF      ":/icons/png/pencil-edit-button.png"
 #define IMAGE_COLLVIEW       ":/images/find.png"
 #define IMAGE_COLLOPEN       ":/icons/collections.png"
-#define IMAGE_EDITSHARE      ":/images/edit_16.png"
+#define IMAGE_EDITSHARE      ":/icons/png/pencil-edit-button.png"
 #define IMAGE_MYFILES        ":/icons/svg/folders1.svg"
 
 /*define viewType_CB value */
diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui
index 68e3446b6..b1f4ceb9b 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui
@@ -88,10 +88,6 @@
         <property name="text">
          <string>Configure shared directories</string>
         </property>
-        <property name="icon">
-         <iconset resource="../images.qrc">
-          <normaloff>:/images/add-share24.png</normaloff>:/images/add-share24.png</iconset>
-        </property>
        </widget>
       </item>
       <item>
diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp
index f66f9d6af..79d6e50dc 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp
@@ -110,7 +110,7 @@
 #define RSID_FILTER_BANNED       0x0020
 #define RSID_FILTER_ALL          0xffff
 
-#define IMAGE_EDIT                 ":/images/edit_16.png"
+#define IMAGE_EDIT                 ":/icons/png/pencil-edit-button.png"
 #define IMAGE_CREATE               ":/icons/circle_new_128.png"
 #define IMAGE_INVITED              ":/icons/bullet_yellow_128.png"
 #define IMAGE_MEMBER               ":/icons/bullet_green_128.png"
diff --git a/retroshare-gui/src/gui/ShareManager.cpp b/retroshare-gui/src/gui/ShareManager.cpp
index 7ebb67b3b..96d2bae1a 100644
--- a/retroshare-gui/src/gui/ShareManager.cpp
+++ b/retroshare-gui/src/gui/ShareManager.cpp
@@ -41,7 +41,7 @@
 
 /* Images for context menu icons */
 #define IMAGE_CANCEL               ":/images/delete.png"
-#define IMAGE_EDIT                 ":/images/edit_16.png"
+#define IMAGE_EDIT                 ":/icons/png/pencil-edit-button.png"
 
 #define COLUMN_PATH         0
 #define COLUMN_VIRTUALNAME  1
diff --git a/retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp b/retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp
index d5b4a7f72..74284872b 100644
--- a/retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp
+++ b/retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp
@@ -74,7 +74,7 @@
 #define IMAGE_FORUMAUTHD     ":/images/konv_message2.png"
 #define IMAGE_COPYLINK       ":/images/copyrslink.png"
 #define IMAGE_WIKI           ":/icons/png/wiki.png"
-#define IMAGE_EDIT           ":/images/edit_16.png"
+#define IMAGE_EDIT           ":/icons/png/pencil-edit-button.png"
 
 
 /** Constructor */
diff --git a/retroshare-gui/src/gui/common/FriendList.cpp b/retroshare-gui/src/gui/common/FriendList.cpp
index 257a0349a..9c9f62e13 100644
--- a/retroshare-gui/src/gui/common/FriendList.cpp
+++ b/retroshare-gui/src/gui/common/FriendList.cpp
@@ -70,7 +70,7 @@
 #define IMAGE_CONNECT            ":/images/connect_friend.png"
 #define IMAGE_COPYLINK           ":/images/copyrslink.png"
 #define IMAGE_GROUP16            ":/images/user/group16.png"
-#define IMAGE_EDIT               ":/images/edit_16.png"
+#define IMAGE_EDIT               ":/icons/png/pencil-edit-button.png"
 #define IMAGE_REMOVE             ":/images/delete.png"
 #define IMAGE_EXPAND             ":/images/edit_add24.png"
 #define IMAGE_COLLAPSE           ":/images/edit_remove24.png"
diff --git a/retroshare-gui/src/gui/common/GroupTreeWidget.ui b/retroshare-gui/src/gui/common/GroupTreeWidget.ui
index 4f0eb977d..1f0a09426 100644
--- a/retroshare-gui/src/gui/common/GroupTreeWidget.ui
+++ b/retroshare-gui/src/gui/common/GroupTreeWidget.ui
@@ -65,8 +65,8 @@
          <string>Display</string>
         </property>
         <property name="icon">
-         <iconset resource="../images.qrc">
-          <normaloff>:/images/looknfeel.png</normaloff>:/images/looknfeel.png</iconset>
+         <iconset resource="../icons.qrc">
+          <normaloff>:/icons/svg/design.svg</normaloff>:/icons/svg/design.svg</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -147,6 +147,7 @@
  </customwidgets>
  <resources>
   <include location="../images.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/common/NewFriendList.cpp b/retroshare-gui/src/gui/common/NewFriendList.cpp
index 8b6f982bb..8d0cc3e32 100644
--- a/retroshare-gui/src/gui/common/NewFriendList.cpp
+++ b/retroshare-gui/src/gui/common/NewFriendList.cpp
@@ -69,7 +69,7 @@
 #define IMAGE_CONNECT            ":/images/connect_friend.png"
 #define IMAGE_COPYLINK           ":/images/copyrslink.png"
 #define IMAGE_GROUP16            ":/images/user/group16.png"
-#define IMAGE_EDIT               ":/images/edit_16.png"
+#define IMAGE_EDIT               ":/icons/png/pencil-edit-button.png"
 #define IMAGE_REMOVE             ":/images/delete.png"
 #define IMAGE_EXPAND             ":/images/edit_add24.png"
 #define IMAGE_COLLAPSE           ":/images/edit_remove24.png"
diff --git a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
index 9cc924a33..3ba587d6d 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
@@ -46,7 +46,7 @@
 #define IMAGE_INFO           ":/images/info16.png"
 //#define IMAGE_GROUPAUTHD     ":/images/konv_message2.png"
 #define IMAGE_COPYLINK       ":/images/copyrslink.png"
-#define IMAGE_EDIT           ":/images/edit_16.png"
+#define IMAGE_EDIT           ":/icons/png/pencil-edit-button.png"
 #define IMAGE_SHARE          ":/images/share-icon-16.png"
 #define IMAGE_TABNEW         ":/images/tab-new.png"
 #define IMAGE_DELETE         ":/images/delete.png"
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
index 03256442d..59fc4990b 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
@@ -62,7 +62,7 @@
 #define IMAGE_MESSAGE          ":/icons/mail/compose.png"
 #define IMAGE_REPLY            ":/icons/mail/reply.png"
 #define IMAGE_MESSAGEREPLY     ":/icons/mail/write-mail.png"
-#define IMAGE_MESSAGEEDIT      ":/images/edit_16.png"
+#define IMAGE_MESSAGEEDIT      ":/icons/png/pencil-edit-button.png"
 #define IMAGE_MESSAGEREMOVE    ":/images/mail_delete.png"
 #define IMAGE_DOWNLOAD         ":/images/start.png"
 #define IMAGE_DOWNLOADALL      ":/images/startall.png"
diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc
index a66c98cf5..0f3477394 100644
--- a/retroshare-gui/src/gui/icons.qrc
+++ b/retroshare-gui/src/gui/icons.qrc
@@ -1,6 +1,7 @@
 <RCC>
     <qresource prefix="/">
         <file>icons/onion.png</file>
+        <file>icons/svg/design.svg</file>
         <file>icons/svg/hidden.svg</file>
         <file>icons/svg/ratio-auto.svg</file>
         <file>icons/svg/ratio-1-1.svg</file>
diff --git a/retroshare-gui/src/gui/icons/svg/design.svg b/retroshare-gui/src/gui/icons/svg/design.svg
new file mode 100644
index 000000000..267da782f
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/svg/design.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<path style="fill:#8B8992;" d="M299.493,502h-90v-86h90V502z M239.493,482h30v-36h-30L239.493,482L239.493,482z"/>
+<polygon style="fill:#57555C;" points="255.993,446 269.493,446 269.493,482 255.993,482 255.993,502 299.493,502 299.493,416 
+	255.993,416 "/>
+<path style="fill:#9BC9FF;" d="M480.493,376h-449V136h449V376z"/>
+<rect x="255.99" y="136" style="fill:#009AE5;" width="224.5" height="240"/>
+<rect x="179.49" y="482" style="fill:#005ECE;" width="150" height="30"/>
+<path style="fill:#B87FD9;" d="M239.493,376h-90V171h90V376z"/>
+<path style="fill:#8034AD;" d="M239.493,376h-45V171h45V376z"/>
+<path style="fill:#8B8992;" d="M289.686,131H98.301L59.39,0h57.243c20.439,0,44.228,7.314,62.86,20.502V0h149.103L289.686,131z"/>
+<polygon style="fill:#57555C;" points="328.596,0 193.993,0 193.993,131 289.686,131 "/>
+<path style="fill:#E3CEF0;" d="M248.493,201h-108c-24.813,0-45-20.187-45-45v-55h198v55C293.493,180.813,273.306,201,248.493,201z"
+	/>
+<path style="fill:#D5B4E8;" d="M194.493,101v100h54c24.813,0,45-20.187,45-45v-55H194.493z"/>
+<path style="fill:#E0E0E2;" d="M427.705,118.346c-9.131,0-18.141-2.394-26.261-7.082c-12.189-7.038-20.909-18.401-24.551-31.997
+	c-3.643-13.595-1.774-27.795,5.264-39.984s18.401-20.908,31.997-24.551l50.898-13.638l13.637,50.898
+	c3.643,13.595,1.774,27.795-5.264,39.984s-18.4,20.909-31.996,24.551C436.89,117.744,432.281,118.346,427.705,118.346z"/>
+<path style="fill:#ACABB1;" d="M478.688,51.992L465.051,1.094h-0.001l-63.606,110.169l0,0c8.12,4.688,17.13,7.083,26.261,7.082
+	c4.577,0,9.185-0.602,13.724-1.818c13.595-3.643,24.958-12.362,31.996-24.551C480.462,79.787,482.331,65.587,478.688,51.992z"/>
+<path style="fill:#FFE477;" d="M280.915,410.025l-77.942-45l125-216.506l77.942,45L280.915,410.025z"/>
+<rect x="301.424" y="165.518" transform="matrix(-0.866 -0.5 0.5 -0.866 459.1859 704.0723)" style="fill:#FFA733;" width="44.999" height="249.995"/>
+<path style="fill:#FF9A00;" d="M402.462,226.167l-101.036-58.333l87.069-98.688l55.898,32.273L402.462,226.167z"/>
+<polygon style="fill:#E67500;" points="444.393,101.419 416.444,85.283 351.944,197 402.462,226.167 "/>
+<path style="fill:#005ECE;" d="M480.493,446h-449V346h449V446z"/>
+<g>
+	<rect x="255.99" y="346" style="fill:#003F8A;" width="224.5" height="100"/>
+	<rect x="254.49" y="482" style="fill:#003F8A;" width="75" height="30"/>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index 52dbea31d..82194c313 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -17,7 +17,6 @@
     <file>images/inbox_22.png</file>
     <file>images/blue_lock.png</file>
     <file>images/blue_lock_open.png</file>
-    <file>images/edit_24.png</file>
     <file>images/streaming.png</file>
     <file>images/white-bubble-64.png</file>
     <file>images/orange-bubble-64.png</file>
@@ -49,7 +48,6 @@
     <file>images/dht16.png</file>
     <file>images/dht32.png</file>
     <file>images/edit-clear-history.png</file>
-    <file>images/edit_16.png</file>
     <file>images/feedback_arrow.png</file>
     <file>images/feedback_arrow_hover.png</file>
     <file>images/firewall_24.png</file>
@@ -81,8 +79,6 @@
     <file>images/avatarstatus-bg-offline-70.png</file>
     <file>images/configure.png</file>
     <file>images/copyrslink.png</file>
-    <file>images/contacts24.png</file>
-    <file>images/contactsclosed24.png</file>
     <file>images/connection.png</file>
     <file>images/Client0.png</file>
     <file>images/Client1.png</file>
@@ -111,7 +107,6 @@
     <file>images/graph-notdownload.png</file>
     <file>images/graph-checking.png</file>
     <file>images/graph-blue.png</file>
-    <file>images/add-share24.png</file>
     <file>images/avatar_background.png</file>
     <file>images/button_cancel.png</file>
     <file>images/chat.png</file>
@@ -132,9 +127,6 @@
     <file>images/download.png</file>
     <file>images/download16.png</file>
     <file>images/edit_add24.png</file>
-    <file>images/edit-bold.png</file>
-    <file>images/edit-italic.png</file>
-    <file>images/edit-underline.png</file>
     <file>images/edit_remove24.png</file>
     <file>images/disabled_plugin_48.png</file>
     <file>images/expand_frame.png</file>
diff --git a/retroshare-gui/src/gui/images/64px_help.png b/retroshare-gui/src/gui/images/64px_help.png
deleted file mode 100644
index f58d478a7..000000000
Binary files a/retroshare-gui/src/gui/images/64px_help.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/add-share24.png b/retroshare-gui/src/gui/images/add-share24.png
deleted file mode 100644
index 031542f51..000000000
Binary files a/retroshare-gui/src/gui/images/add-share24.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/contacts24.png b/retroshare-gui/src/gui/images/contacts24.png
deleted file mode 100644
index 979c51ecb..000000000
Binary files a/retroshare-gui/src/gui/images/contacts24.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/contactsclosed24.png b/retroshare-gui/src/gui/images/contactsclosed24.png
deleted file mode 100644
index 4698bb08a..000000000
Binary files a/retroshare-gui/src/gui/images/contactsclosed24.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/edit-bold.png b/retroshare-gui/src/gui/images/edit-bold.png
deleted file mode 100644
index a2c44d52d..000000000
Binary files a/retroshare-gui/src/gui/images/edit-bold.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/edit-italic.png b/retroshare-gui/src/gui/images/edit-italic.png
deleted file mode 100644
index a0ab94570..000000000
Binary files a/retroshare-gui/src/gui/images/edit-italic.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/edit-underline.png b/retroshare-gui/src/gui/images/edit-underline.png
deleted file mode 100644
index 98a1441e1..000000000
Binary files a/retroshare-gui/src/gui/images/edit-underline.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/edit_16.png b/retroshare-gui/src/gui/images/edit_16.png
deleted file mode 100644
index 42f442c2f..000000000
Binary files a/retroshare-gui/src/gui/images/edit_16.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/edit_24.png b/retroshare-gui/src/gui/images/edit_24.png
deleted file mode 100644
index 1656b786f..000000000
Binary files a/retroshare-gui/src/gui/images/edit_24.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/images/looknfeel.png b/retroshare-gui/src/gui/images/looknfeel.png
deleted file mode 100644
index 155e2d865..000000000
Binary files a/retroshare-gui/src/gui/images/looknfeel.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/msgs/MessageWindow.ui b/retroshare-gui/src/gui/msgs/MessageWindow.ui
index d15d5447d..6b796d226 100644
--- a/retroshare-gui/src/gui/msgs/MessageWindow.ui
+++ b/retroshare-gui/src/gui/msgs/MessageWindow.ui
@@ -127,8 +127,8 @@
           <string>Display</string>
          </property>
          <property name="icon">
-          <iconset resource="../images.qrc">
-           <normaloff>:/images/looknfeel.png</normaloff>:/images/looknfeel.png</iconset>
+          <iconset resource="../icons.qrc">
+           <normaloff>:/icons/svg/design.svg</normaloff>:/icons/svg/design.svg</iconset>
          </property>
          <property name="iconSize">
           <size>