diff --git a/core/img/appstore.png b/core/img/appstore.png
new file mode 100644
index 0000000000..009b2b51b9
Binary files /dev/null and b/core/img/appstore.png differ
diff --git a/core/img/desktopapp.png b/core/img/desktopapp.png
new file mode 100644
index 0000000000..182ddd2cf1
Binary files /dev/null and b/core/img/desktopapp.png differ
diff --git a/core/img/desktopapp.svg b/core/img/desktopapp.svg
new file mode 100644
index 0000000000..93d91e461a
--- /dev/null
+++ b/core/img/desktopapp.svg
@@ -0,0 +1,100 @@
+<?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"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="170"
+   height="60"
+   viewBox="0 0 1346.4 475.2"
+   enable-background="new 0 0 792 612"
+   xml:space="preserve"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="desktopapp.svg"
+   inkscape:export-filename="desktopapp.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"><metadata
+   id="metadata3043"><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></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs3041" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1280"
+   inkscape:window-height="773"
+   id="namedview3039"
+   showgrid="true"
+   fit-margin-top="3"
+   fit-margin-left="0"
+   fit-margin-right="0"
+   fit-margin-bottom="3"
+   inkscape:zoom="2"
+   inkscape:cx="155.97228"
+   inkscape:cy="56.168028"
+   inkscape:window-x="0"
+   inkscape:window-y="-1"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1"
+   showguides="true"
+   inkscape:guide-bbox="true"><inkscape:grid
+     type="xygrid"
+     id="grid3146"
+     empspacing="4"
+     visible="true"
+     enabled="true"
+     snapvisiblegridlinesonly="true"
+     originx="-3.5865408e-16px"
+     originy="-3px" /></sodipodi:namedview>
+
+
+<rect
+   id="rect3026"
+   width="1346.3999"
+   height="475.20016"
+   x="-2.8405402e-15"
+   y="-3.5527137e-15"
+   rx="50"
+   ry="50"
+   style="fill:#1a1a1a" /><path
+   d="m 150.48,126.72 c -11.88,0 -23.76,11.88 -23.76,23.76 l 0,166.32 -47.52,23.76 0,11.88 c 0,0 0,11.88 11.88,11.88 l 356.4,0 c 11.88,0 11.88,-11.88 11.88,-11.88 l 0,-11.88 -47.52,-23.76 0,-166.32 c 0,-11.88 -11.88,-23.76 -23.76,-23.76 z m 0,23.66718 237.6,0 0,142.65282 -237.6,0 z"
+   id="path3037"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="sscccsscccsssccccc"
+   style="fill:#ffffff" /><text
+   xml:space="preserve"
+   style="font-size:316.79998778999998876px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+   x="451.44"
+   y="239.58"
+   id="text2983"
+   sodipodi:linespacing="125%"><tspan
+     sodipodi:role="line"
+     id="tspan2985"
+     x="451.44"
+     y="239.58"
+     style="font-size:126.71999999999999886px;font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:FreeSans Semi-Bold;fill:#ffffff">Desktop app</tspan></text>
+<text
+   xml:space="preserve"
+   style="font-size:316.79998778999998876px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+   x="493.01996"
+   y="342.54001"
+   id="text2991"
+   sodipodi:linespacing="125%"><tspan
+     sodipodi:role="line"
+     id="tspan2993"
+     x="493.01996"
+     y="342.54001"
+     style="font-size:71.28000000000000114px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:FreeSans;fill:#ffffff">Windows, OS X, Linux</tspan></text>
+</svg>
\ No newline at end of file
diff --git a/core/img/googleplay.png b/core/img/googleplay.png
new file mode 100644
index 0000000000..2d9ad62960
Binary files /dev/null and b/core/img/googleplay.png differ
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 9dd17daaeb..a767ba4165 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -75,3 +75,8 @@ table.shareAPI td { padding-bottom: 0.8em; }
 
 /* HELP */
 .pressed {background-color:#DDD;}
+
+.clientsbox { margin:12px; text-align:center; }
+.clientsbox h1 { font-size:40px; font-weight:bold; margin:50px 0 20px; }
+.clientsbox h2 { font-size:20px; font-weight:bold; margin:35px 0 10px; }
+
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 6ccb607e63..078328442e 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -8,12 +8,31 @@
 	<p id="quotatext"><?php echo $l->t('You have used <strong>%s</strong> of the available <strong>%s</strong>', array($_['usage'], $_['total_space']));?></p>
 </div></div>
 
-<fieldset class="personalblock">
-	<legend><strong><?php echo $l->t('Clients');?></strong></legend>
-	<a class="button" href="<?php echo $_['clients']['desktop']; ?>" target="_blank"><?php echo $l->t('Download Desktop Clients');?></a>
-	<a class="button" href="<?php echo $_['clients']['android']; ?>" target="_blank"><?php echo $l->t('Download Android Client');?></a>
-	<a class="button" href="<?php echo $_['clients']['ios']; ?>" target="_blank"><?php echo $l->t('Download iOS Client');?></a>
-</fieldset>
+
+
+<div class="clientsbox">
+<h2><?php echo $l->t('Get the apps to sync your files');?></h2>
+<a href="<?php echo $_['clients']['desktop']; ?>">
+        <img src="<?php echo OCP\Util::imagePath('core', 'desktopapp.png'); ?>" />
+</a>
+<a href="<?php echo $_['clients']['android']; ?>">
+        <img src="<?php echo OCP\Util::imagePath('core', 'googleplay.png'); ?>" />
+</a>
+<a href="<?php echo $_['clients']['ios']; ?>">
+        <img src="<?php echo OCP\Util::imagePath('core', 'appstore.png'); ?>" />
+</a>
+</div>
+
+
+<?php
+if(OC_APP::isEnabled('firstrunwizard')) {
+?>
+
+        <center><a class="button" href="#" id="showWizard"><?php echo $l->t('Show First Run Wizard again');?></a></center>
+
+<?php
+}
+?>
 
 <?php
 if($_['passwordChangeSupported']) {