Adding X2Go svg icon, and remove PNGs

8 files changed, 642 insertions, 46 deletions

diff --git a/plugins/rdp/CMakeLists.txt b/plugins/rdp/CMakeLists.txt
index a84534461..414a4a4fc 100644
--- a/plugins/rdp/CMakeLists.txt
+++ b/plugins/rdp/CMakeLists.txt
@@ -40,23 +40,23 @@ find_package(X11)
 find_suggested_package(Cups)
 
 set(REMMINA_PLUGIN_RDP_SRCS
-        rdp_plugin.c
-        rdp_plugin.h
-        rdp_event.c
-        rdp_event.h
-        rdp_file.c
-        rdp_file.h
-        rdp_settings.c
-        rdp_settings.h
-        rdp_graphics.c
-        rdp_graphics.h
-        rdp_cliprdr.c
-        rdp_cliprdr.h
-        rdp_monitor.c
-        rdp_monitor.h
-        rdp_channels.c
-        rdp_channels.h
-        )
+    rdp_plugin.c
+    rdp_plugin.h
+    rdp_event.c
+    rdp_event.h
+    rdp_file.c
+    rdp_file.h
+    rdp_settings.c
+    rdp_settings.h
+    rdp_graphics.c
+    rdp_graphics.h
+    rdp_cliprdr.c
+    rdp_cliprdr.h
+    rdp_monitor.c
+    rdp_monitor.h
+    rdp_channels.c
+    rdp_channels.h
+    )
 
 add_definitions(-DFREERDP_REQUIRED_MAJOR=${FREERDP_REQUIRED_MAJOR})
 add_definitions(-DFREERDP_REQUIRED_MINOR=${FREERDP_REQUIRED_MINOR})
@@ -64,8 +64,8 @@ add_definitions(-DFREERDP_REQUIRED_REVISION=${FREERDP_REQUIRED_REVISION})
 
 option(WITH_FREERDP_MASTER "Compile the RDP plugin using symbols from FreeRDP master branch." OFF)
 if(WITH_FREERDP_MASTER)
-	message(STATUS "Compiling the RDP plugin using symbols from FreeRDP master branch.")
-	add_definitions(-DWITH_FREERDP_MASTER=ON)
+    message(STATUS "Compiling the RDP plugin using symbols from FreeRDP master branch.")
+    add_definitions(-DWITH_FREERDP_MASTER=ON)
 endif()
 
 add_library(remmina-plugin-rdp MODULE ${REMMINA_PLUGIN_RDP_SRCS})
@@ -73,25 +73,25 @@ set_target_properties(remmina-plugin-rdp PROPERTIES PREFIX "")
 set_target_properties(remmina-plugin-rdp PROPERTIES NO_SONAME 1)
 
 if(WITH_FREERDP3)
-	include_directories(${REMMINA_COMMON_INCLUDE_DIRS} ${FREERDP3_INCLUDE_DIRS} ${X11_INCLUDE_DIR})
-	target_link_libraries(remmina-plugin-rdp
-		${REMMINA_COMMON_LIBRARIES} ${FREERDP3_LIBRARIES} ${X11_LIBRARIES})
+    include_directories(${REMMINA_COMMON_INCLUDE_DIRS} ${FREERDP3_INCLUDE_DIRS} ${X11_INCLUDE_DIR})
+    target_link_libraries(remmina-plugin-rdp
+        ${REMMINA_COMMON_LIBRARIES} ${FREERDP3_LIBRARIES} ${X11_LIBRARIES})
 else()
-	include_directories(${REMMINA_COMMON_INCLUDE_DIRS} ${FREERDP_INCLUDE_DIRS} ${X11_INCLUDE_DIR})
-	target_link_libraries(remmina-plugin-rdp
-		${REMMINA_COMMON_LIBRARIES} ${FREERDP_LIBRARIES} ${X11_LIBRARIES})
+    include_directories(${REMMINA_COMMON_INCLUDE_DIRS} ${FREERDP_INCLUDE_DIRS} ${X11_INCLUDE_DIR})
+    target_link_libraries(remmina-plugin-rdp
+        ${REMMINA_COMMON_LIBRARIES} ${FREERDP_LIBRARIES} ${X11_LIBRARIES})
 endif()
 
 if(CUPS_FOUND)
     add_definitions(-DHAVE_CUPS)
     include_directories(${CUPS_INCLUDE_DIR})
-if(WITH_FREERDP3)
-    target_link_libraries(remmina-plugin-rdp
-        ${REMMINA_COMMON_LIBRARIES} ${FREERDP3_LIBRARIES} ${X11_LIBRARIES} ${CUPS_LIBRARIES})
-else()
-    target_link_libraries(remmina-plugin-rdp
-        ${REMMINA_COMMON_LIBRARIES} ${FREERDP_LIBRARIES} ${X11_LIBRARIES} ${CUPS_LIBRARIES})
-endif()
+    if(WITH_FREERDP3)
+        target_link_libraries(remmina-plugin-rdp
+            ${REMMINA_COMMON_LIBRARIES} ${FREERDP3_LIBRARIES} ${X11_LIBRARIES} ${CUPS_LIBRARIES})
+    else()
+        target_link_libraries(remmina-plugin-rdp
+            ${REMMINA_COMMON_LIBRARIES} ${FREERDP_LIBRARIES} ${X11_LIBRARIES} ${CUPS_LIBRARIES})
+    endif()
 endif()
 
 install(TARGETS remmina-plugin-rdp DESTINATION ${REMMINA_PLUGINDIR})
diff --git a/plugins/x2go/16x16/emblems/org.remmina.Remmina-x2go.png b/plugins/x2go/16x16/emblems/org.remmina.Remmina-x2go.png
deleted file mode 100644
index 6452b5115..000000000
--- a/plugins/x2go/16x16/emblems/org.remmina.Remmina-x2go.png
+++ /dev/null
diff --git a/plugins/x2go/22x22/emblems/org.remmina.Remmina-x2go.png b/plugins/x2go/22x22/emblems/org.remmina.Remmina-x2go.png
deleted file mode 100644
index 1608876ee..000000000
--- a/plugins/x2go/22x22/emblems/org.remmina.Remmina-x2go.png
+++ /dev/null
diff --git a/plugins/x2go/CMakeLists.txt b/plugins/x2go/CMakeLists.txt
index 73abd6806..26a795217 100644
--- a/plugins/x2go/CMakeLists.txt
+++ b/plugins/x2go/CMakeLists.txt
@@ -36,9 +36,9 @@
 #  files in the program, then also delete it here.
 
 set(REMMINA_PLUGIN_X2GO_SRCS
-	x2go_plugin.c
-	x2go_plugin.h
-)
+    x2go_plugin.c
+    x2go_plugin.h
+    )
 
 add_library(remmina-plugin-x2go ${REMMINA_PLUGIN_X2GO_SRCS})
 set_target_properties(remmina-plugin-x2go PROPERTIES PREFIX "")
@@ -57,10 +57,11 @@ target_link_libraries(remmina-plugin-x2go
 
 install(TARGETS remmina-plugin-x2go DESTINATION ${REMMINA_PLUGINDIR})
 
-set(APPICON16_EMBLEMS_DIR "${REMMINA_DATADIR}/icons/hicolor/16x16/emblems")
-install(FILES 16x16/emblems/org.remmina.Remmina-x2go.png DESTINATION ${APPICON16_EMBLEMS_DIR})
+install(FILES
+    scalable/emblems/org.remmina.Remmina-x2go-ssh-symbolic.svg
+    scalable/emblems/org.remmina.Remmina-x2go-symbolic.svg
+    DESTINATION ${APPICONSCALE_EMBLEMS_DIR})
 
-set(APPICON22_EMBLEMS_DIR "${REMMINA_DATADIR}/icons/hicolor/22x22/emblems")
-install(FILES 22x22/emblems/org.remmina.Remmina-x2go.png DESTINATION ${APPICON22_EMBLEMS_DIR})
-
-gtk_update_icon_cache("${REMMINA_DATADIR}/icons/hicolor")
+if(WITH_ICON_CACHE)
+    gtk_update_icon_cache("${REMMINA_DATADIR}/icons/hicolor")
+endif()
diff --git a/plugins/x2go/scalable/emblems/org.remmina.Remmina-x2go-ssh-symbolic.svg b/plugins/x2go/scalable/emblems/org.remmina.Remmina-x2go-ssh-symbolic.svg
new file mode 100644
index 000000000..2cf9b9249
--- /dev/null
+++ b/plugins/x2go/scalable/emblems/org.remmina.Remmina-x2go-ssh-symbolic.svg
@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   width="128"
+   height="128"
+   sodipodi:docname="x2go-logo.svg"
+   sodipodi:docbase="/Users/h1/Desktop"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   inkscape:export-filename="/Users/h1/Desktop/x2go-logo.png"
+   inkscape:export-xdpi="900"
+   inkscape:export-ydpi="900">
+  <metadata
+     id="metadata87">
+    <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>x2go Logo</dc:title>
+        <dc:date>12.06.2007</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Heinz-M. Graesing</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>obviously-nice</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>obviously-nice</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:source>http://www.x2go.org/artwork</dc:source>
+        <dc:language>DE</dc:language>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>Logo</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-nd/3.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-nd/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs85">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 64 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="128 : 64 : 1"
+       inkscape:persp3d-origin="64 : 42.666667 : 1"
+       id="perspective46" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-height="834"
+     inkscape:window-width="1295"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showgrid="true"
+     inkscape:object-nodes="true"
+     inkscape:grid-points="true"
+     inkscape:guide-points="true"
+     width="128px"
+     height="128px"
+     inkscape:zoom="3.9375"
+     inkscape:cx="64"
+     inkscape:cy="64"
+     inkscape:window-x="395"
+     inkscape:window-y="117"
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="1px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
+  <g
+     style="fill:#4d4d4d"
+     id="g4"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 90,977.626 L 103.32,951.85 C 104.256,949.33 104.688,947.53 104.688,946.594 C 104.688,945.082 104.184,943.93 103.248,943.282 C 102.24,942.562 100.512,942.202 98.064,942.202 L 98.064,939.826 L 120.168,939.826 L 120.168,942.202 C 117.144,942.202 114.984,942.85 113.472,944.146 C 111.96,945.442 109.872,948.898 106.992,954.514 L 92.376,982.954 L 110.808,1024.498 C 112.68,1028.386 114.336,1031.122 115.776,1032.634 C 117.216,1034.074 118.944,1034.866 120.888,1034.866 L 120.888,1037.17 L 94.536,1037.17 L 94.536,1034.866 C 96.912,1034.866 98.568,1034.578 99.576,1033.93 C 100.584,1033.354 101.088,1032.346 101.088,1031.05 C 101.088,1029.826 100.368,1027.666 99.072,1024.498 L 86.112,995.482 L 71.28,1024.498 C 69.912,1026.946 69.192,1028.962 69.192,1030.474 C 69.192,1033.426 71.352,1034.866 75.672,1034.866 L 75.672,1037.17 L 55.728,1037.17 L 55.728,1034.866 C 57.672,1034.866 59.4,1034.218 60.84,1032.994 C 62.28,1031.77 63.792,1029.682 65.232,1026.586 L 83.736,990.01 L 67.248,952.498 C 65.52,948.466 63.936,945.802 62.424,944.362 C 60.84,942.922 58.608,942.202 55.728,942.202 L 55.728,939.826 L 84.024,939.826 L 84.024,942.202 C 79.632,942.202 77.4,943.714 77.4,946.738 C 77.4,948.25 77.832,949.978 78.696,951.85 L 90,977.626 z "
+       id="path6"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g8"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,940.474 L 50.976,939.25 L 50.976,941.698 L 6.984,940.474 z "
+       id="path10"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g12"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,946.45 L 50.976,945.298 L 50.976,946.954 L 56.16,947.026 L 56.52,947.026 L 56.808,947.026 L 57.096,947.098 L 57.384,947.098 L 57.672,947.17 L 57.888,947.242 L 58.104,947.314 L 58.32,947.386 L 58.464,947.458 L 58.608,947.53 L 58.752,947.602 L 58.896,947.674 L 58.968,947.746 L 59.112,947.818 L 59.112,947.89 L 59.184,947.89 L 6.984,946.45 z "
+       id="path14"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g16"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,952.498 L 61.272,950.986 L 61.488,951.346 L 61.776,951.922 L 62.064,952.498 L 62.352,953.146 L 62.64,953.794 L 62.784,954.01 L 6.984,952.498 z "
+       id="path18"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g20"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,958.474 L 63.936,956.89 L 65.376,960.058 L 6.984,958.474 z "
+       id="path22"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g24"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,964.45 L 66.528,962.866 L 67.968,966.106 L 6.984,964.45 z "
+       id="path26"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g28"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,970.498 L 69.12,968.77 L 70.632,972.226 L 6.984,970.498 z "
+       id="path30"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g32"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,976.474 L 71.712,974.674 L 73.296,978.274 L 6.984,976.474 z "
+       id="path34"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g36"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,982.45 L 74.304,980.65 L 75.96,984.322 L 6.984,982.45 z "
+       id="path38"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g40"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,988.426 L 76.896,986.554 L 78.408,989.866 L 78.192,990.37 L 6.984,988.426 z "
+       id="path42"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g44"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,994.402 L 77.112,992.458 L 75.168,996.274 L 6.984,994.402 z "
+       id="path46"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g48"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,1000.378 L 74.016,998.578 L 72.216,1002.178 L 6.984,1000.378 z "
+       id="path50"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g52"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,1006.354 L 70.92,1004.626 L 69.192,1008.082 L 6.984,1006.354 z "
+       id="path54"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g56"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,1012.402 L 67.896,1010.746 L 66.168,1013.986 L 6.984,1012.402 z "
+       id="path58"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g60"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,1036.378 L 50.976,1035.154 L 50.976,1037.602 L 6.984,1036.378 z "
+       id="path62"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g64"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,1030.402 L 58.104,1028.962 L 58.032,1029.106 L 57.888,1029.178 L 57.744,1029.322 L 57.6,1029.394 L 57.528,1029.538 L 57.384,1029.61 L 57.312,1029.682 L 57.168,1029.682 L 57.024,1029.754 L 56.952,1029.826 L 56.808,1029.898 L 56.736,1029.898 L 56.592,1029.97 L 56.448,1029.97 L 56.376,1029.97 L 56.232,1030.042 L 56.088,1030.042 L 55.944,1030.042 L 50.976,1030.114 L 50.976,1031.554 L 6.984,1030.402 z "
+       id="path66"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g68"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,1024.354 L 61.776,1022.914 L 60.984,1024.498 L 60.696,1025.002 L 60.48,1025.506 L 60.264,1025.866 L 6.984,1024.354 z "
+       id="path70"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g72"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,1018.378 L 64.8,1016.794 L 63.288,1019.89 L 6.984,1018.378 z "
+       id="path74"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g76"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 63.936,924.49 L 118.872,924.49 C 123.84,924.49 127.872,928.522 127.872,933.49 L 127.872,1043.362 C 127.872,1048.33 123.84,1052.362 118.872,1052.362 L 63.936,1052.362 L 63.936,1050.418 L 117.864,1050.418 C 122.256,1050.418 125.856,1046.818 125.856,1042.426 L 125.856,934.498 C 125.856,930.106 122.256,926.506 117.864,926.506 L 63.936,926.506 L 63.936,924.49 z "
+       id="path78"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g80"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 9,924.49 L 63.936,924.49 L 63.936,926.506 L 9.936,926.506 C 5.544,926.506 1.944,930.106 1.944,934.498 L 1.944,1042.426 C 1.944,1046.818 5.544,1050.418 9.936,1050.418 L 63.936,1050.418 L 63.936,1052.362 L 9,1052.362 C 4.032,1052.362 0,1048.33 0,1043.362 L 0,933.49 C 0,928.522 4.032,924.49 9,924.49 z "
+       id="path82"
+       style="fill:#4d4d4d" />
+  </g>
+</svg>
diff --git a/plugins/x2go/scalable/emblems/org.remmina.Remmina-x2go-symbolic.svg b/plugins/x2go/scalable/emblems/org.remmina.Remmina-x2go-symbolic.svg
new file mode 100644
index 000000000..2cf9b9249
--- /dev/null
+++ b/plugins/x2go/scalable/emblems/org.remmina.Remmina-x2go-symbolic.svg
@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   width="128"
+   height="128"
+   sodipodi:docname="x2go-logo.svg"
+   sodipodi:docbase="/Users/h1/Desktop"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   inkscape:export-filename="/Users/h1/Desktop/x2go-logo.png"
+   inkscape:export-xdpi="900"
+   inkscape:export-ydpi="900">
+  <metadata
+     id="metadata87">
+    <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>x2go Logo</dc:title>
+        <dc:date>12.06.2007</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Heinz-M. Graesing</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>obviously-nice</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>obviously-nice</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:source>http://www.x2go.org/artwork</dc:source>
+        <dc:language>DE</dc:language>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>Logo</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-nd/3.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-nd/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs85">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 64 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="128 : 64 : 1"
+       inkscape:persp3d-origin="64 : 42.666667 : 1"
+       id="perspective46" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-height="834"
+     inkscape:window-width="1295"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showgrid="true"
+     inkscape:object-nodes="true"
+     inkscape:grid-points="true"
+     inkscape:guide-points="true"
+     width="128px"
+     height="128px"
+     inkscape:zoom="3.9375"
+     inkscape:cx="64"
+     inkscape:cy="64"
+     inkscape:window-x="395"
+     inkscape:window-y="117"
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="1px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
+  <g
+     style="fill:#4d4d4d"
+     id="g4"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 90,977.626 L 103.32,951.85 C 104.256,949.33 104.688,947.53 104.688,946.594 C 104.688,945.082 104.184,943.93 103.248,943.282 C 102.24,942.562 100.512,942.202 98.064,942.202 L 98.064,939.826 L 120.168,939.826 L 120.168,942.202 C 117.144,942.202 114.984,942.85 113.472,944.146 C 111.96,945.442 109.872,948.898 106.992,954.514 L 92.376,982.954 L 110.808,1024.498 C 112.68,1028.386 114.336,1031.122 115.776,1032.634 C 117.216,1034.074 118.944,1034.866 120.888,1034.866 L 120.888,1037.17 L 94.536,1037.17 L 94.536,1034.866 C 96.912,1034.866 98.568,1034.578 99.576,1033.93 C 100.584,1033.354 101.088,1032.346 101.088,1031.05 C 101.088,1029.826 100.368,1027.666 99.072,1024.498 L 86.112,995.482 L 71.28,1024.498 C 69.912,1026.946 69.192,1028.962 69.192,1030.474 C 69.192,1033.426 71.352,1034.866 75.672,1034.866 L 75.672,1037.17 L 55.728,1037.17 L 55.728,1034.866 C 57.672,1034.866 59.4,1034.218 60.84,1032.994 C 62.28,1031.77 63.792,1029.682 65.232,1026.586 L 83.736,990.01 L 67.248,952.498 C 65.52,948.466 63.936,945.802 62.424,944.362 C 60.84,942.922 58.608,942.202 55.728,942.202 L 55.728,939.826 L 84.024,939.826 L 84.024,942.202 C 79.632,942.202 77.4,943.714 77.4,946.738 C 77.4,948.25 77.832,949.978 78.696,951.85 L 90,977.626 z "
+       id="path6"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g8"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,940.474 L 50.976,939.25 L 50.976,941.698 L 6.984,940.474 z "
+       id="path10"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g12"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,946.45 L 50.976,945.298 L 50.976,946.954 L 56.16,947.026 L 56.52,947.026 L 56.808,947.026 L 57.096,947.098 L 57.384,947.098 L 57.672,947.17 L 57.888,947.242 L 58.104,947.314 L 58.32,947.386 L 58.464,947.458 L 58.608,947.53 L 58.752,947.602 L 58.896,947.674 L 58.968,947.746 L 59.112,947.818 L 59.112,947.89 L 59.184,947.89 L 6.984,946.45 z "
+       id="path14"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g16"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,952.498 L 61.272,950.986 L 61.488,951.346 L 61.776,951.922 L 62.064,952.498 L 62.352,953.146 L 62.64,953.794 L 62.784,954.01 L 6.984,952.498 z "
+       id="path18"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g20"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,958.474 L 63.936,956.89 L 65.376,960.058 L 6.984,958.474 z "
+       id="path22"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g24"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,964.45 L 66.528,962.866 L 67.968,966.106 L 6.984,964.45 z "
+       id="path26"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g28"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,970.498 L 69.12,968.77 L 70.632,972.226 L 6.984,970.498 z "
+       id="path30"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g32"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,976.474 L 71.712,974.674 L 73.296,978.274 L 6.984,976.474 z "
+       id="path34"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g36"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,982.45 L 74.304,980.65 L 75.96,984.322 L 6.984,982.45 z "
+       id="path38"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g40"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,988.426 L 76.896,986.554 L 78.408,989.866 L 78.192,990.37 L 6.984,988.426 z "
+       id="path42"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g44"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,994.402 L 77.112,992.458 L 75.168,996.274 L 6.984,994.402 z "
+       id="path46"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g48"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,1000.378 L 74.016,998.578 L 72.216,1002.178 L 6.984,1000.378 z "
+       id="path50"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g52"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,1006.354 L 70.92,1004.626 L 69.192,1008.082 L 6.984,1006.354 z "
+       id="path54"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g56"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,1012.402 L 67.896,1010.746 L 66.168,1013.986 L 6.984,1012.402 z "
+       id="path58"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g60"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,1036.378 L 50.976,1035.154 L 50.976,1037.602 L 6.984,1036.378 z "
+       id="path62"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g64"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,1030.402 L 58.104,1028.962 L 58.032,1029.106 L 57.888,1029.178 L 57.744,1029.322 L 57.6,1029.394 L 57.528,1029.538 L 57.384,1029.61 L 57.312,1029.682 L 57.168,1029.682 L 57.024,1029.754 L 56.952,1029.826 L 56.808,1029.898 L 56.736,1029.898 L 56.592,1029.97 L 56.448,1029.97 L 56.376,1029.97 L 56.232,1030.042 L 56.088,1030.042 L 55.944,1030.042 L 50.976,1030.114 L 50.976,1031.554 L 6.984,1030.402 z "
+       id="path66"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g68"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,1024.354 L 61.776,1022.914 L 60.984,1024.498 L 60.696,1025.002 L 60.48,1025.506 L 60.264,1025.866 L 6.984,1024.354 z "
+       id="path70"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g72"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 6.984,1018.378 L 64.8,1016.794 L 63.288,1019.89 L 6.984,1018.378 z "
+       id="path74"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g76"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 63.936,924.49 L 118.872,924.49 C 123.84,924.49 127.872,928.522 127.872,933.49 L 127.872,1043.362 C 127.872,1048.33 123.84,1052.362 118.872,1052.362 L 63.936,1052.362 L 63.936,1050.418 L 117.864,1050.418 C 122.256,1050.418 125.856,1046.818 125.856,1042.426 L 125.856,934.498 C 125.856,930.106 122.256,926.506 117.864,926.506 L 63.936,926.506 L 63.936,924.49 z "
+       id="path78"
+       style="fill:#4d4d4d" />
+  </g>
+  <g
+     style="fill:#4d4d4d"
+     id="g80"
+     transform="translate(0,-924.362)">
+    <path
+       d="M 9,924.49 L 63.936,924.49 L 63.936,926.506 L 9.936,926.506 C 5.544,926.506 1.944,930.106 1.944,934.498 L 1.944,1042.426 C 1.944,1046.818 5.544,1050.418 9.936,1050.418 L 63.936,1050.418 L 63.936,1052.362 L 9,1052.362 C 4.032,1052.362 0,1048.33 0,1043.362 L 0,933.49 C 0,928.522 4.032,924.49 9,924.49 z "
+       id="path82"
+       style="fill:#4d4d4d" />
+  </g>
+</svg>
diff --git a/plugins/x2go/x2go_plugin.c b/plugins/x2go/x2go_plugin.c
index 65536a501..8af7b3c85 100644
--- a/plugins/x2go/x2go_plugin.c
+++ b/plugins/x2go/x2go_plugin.c
@@ -496,7 +496,7 @@ static void rmplugin_x2go_pyhoca_cli_exited(GPid pid,
 		REMMINA_PLUGIN_DEBUG("Doing nothing since gpdata is already 'NULL'.");
 		return;
 	}
-	
+
 	if (gpdata->pidx2go <= 0) {
 		REMMINA_PLUGIN_DEBUG("Doing nothing since pyhoca-cli was expected to stop.");
 		return;
@@ -619,7 +619,7 @@ static gboolean rmplugin_x2go_save_credentials(RemminaFile* remminafile,
 						   s_username);
 	} else {
 		g_strlcpy(errmsg, _("Internal error: Could not save new credentials."), 512);
-		
+
 				    REMMINA_PLUGIN_CRITICAL("%s", _("An error occured while trying to save "
 				"new credentials: 's_password' or "
 				"'s_username' strings were not set."));
@@ -826,7 +826,7 @@ static gboolean rmplugin_x2go_exec_x2go(gchar *host,
 	}
 
 	argv[argc++] = NULL;
-	
+
 	GError *error = NULL;
 	gchar **envp = g_get_environ();
 	gboolean success = g_spawn_async_with_pipes (NULL, argv, envp,
@@ -1626,7 +1626,7 @@ static RemminaProtocolPlugin rmplugin_x2go = {
 	GETTEXT_PACKAGE,			// Translation domain
 	PLUGIN_VERSION,				// Version number
 	PLUGIN_APPICON,				// Icon for normal connection
-	PLUGIN_APPICON,				// Icon for SSH connection
+	PLUGIN_SSH_APPICON,			// Icon for SSH connection
 	rmplugin_x2go_basic_settings,		// Array for basic settings
 	NULL,					// Array for advanced settings
 	REMMINA_PROTOCOL_SSH_SETTING_TUNNEL,	// SSH settings type
diff --git a/plugins/x2go/x2go_plugin.h b/plugins/x2go/x2go_plugin.h
index b8884d276..5fc53a6dc 100644
--- a/plugins/x2go/x2go_plugin.h
+++ b/plugins/x2go/x2go_plugin.h
@@ -42,4 +42,5 @@
 #define PLUGIN_NAME        "X2GO"
 #define PLUGIN_DESCRIPTION N_("X2Go - Launch an X2Go session")
 #define PLUGIN_VERSION     "2.0.0"
-#define PLUGIN_APPICON     "org.remmina.Remmina-x2go"
+#define PLUGIN_APPICON     "org.remmina.Remmina-x2go-symbolic"
+#define PLUGIN_SSH_APPICON     "org.remmina.Remmina-x2go-ssh-symbolic"