diff --git a/client/src/campaigns/Statistics.js b/client/src/campaigns/Statistics.js
index cc0d1d3d..2265638d 100644
--- a/client/src/campaigns/Statistics.js
+++ b/client/src/campaigns/Statistics.js
@@ -88,7 +88,7 @@ export default class Statistics extends Component {
             const val = entity[key]
 
             return (
-                <AlignedRow label={label}><span className={styles.statsMetrics}>{val}</span>{showZoomIn && <span className={styles.zoomIn}><Link to={`/campaigns/${entity.id}/statistics/${key}`}><Icon icon="zoom-in"/></Link></span>}</AlignedRow>
+                <AlignedRow label={label}><span className={styles.statsMetrics}>{val}</span>{showZoomIn && <span className={styles.zoomIn}><Link to={`/campaigns/${entity.id}/statistics/${key}`}><Icon icon="search-plus"/></Link></span>}</AlignedRow>
             );
         }
 
@@ -103,7 +103,7 @@ export default class Statistics extends Component {
 
             return (
                 <AlignedRow label={label}>
-                    {showZoomIn && <span className={styles.statsProgressBarZoomIn}><Link to={`/campaigns/${entity.id}/statistics/${key}`}><Icon icon="zoom-in"/></Link></span>}
+                    {showZoomIn && <span className={styles.statsProgressBarZoomIn}><Link to={`/campaigns/${entity.id}/statistics/${key}`}><Icon icon="search-plus"/></Link></span>}
                     <div className={`progress ${styles.statsProgressBar}`}>
                         <div
                             className={`progress-bar progress-bar-${progressBarClass}`}
diff --git a/client/src/campaigns/styles.scss b/client/src/campaigns/styles.scss
index 9760c4ee..a1a05000 100644
--- a/client/src/campaigns/styles.scss
+++ b/client/src/campaigns/styles.scss
@@ -86,7 +86,6 @@
 }
 
 .sectionTitle {
-  font-weight: bold;
   margin-bottom: 30px;
 }
 
diff --git a/client/src/lib/files.js b/client/src/lib/files.js
index c82c0c75..42fe2b0b 100644
--- a/client/src/lib/files.js
+++ b/client/src/lib/files.js
@@ -173,8 +173,13 @@ export default class Files extends Component {
 
                 {
                     this.props.entity.permissions.includes(this.props.managePermission) &&
-                    <Dropzone onDrop={::this.onDrop} className={styles.dropZone} activeClassName={styles.dropZoneActive}>
-                        {state => state.isDragActive ? t('dropCountFile', {count: state.draggedFiles.length}) : t('dropFilesHere')}
+                    <Dropzone onDrop={::this.onDrop}>
+                        {({getRootProps, getInputProps, isDragActive, draggedFiles}) => (
+                            <div {...getRootProps()} className={styles.dropZone + (isDragActive ? ' ' + styles.dropZoneActive : '')}>
+                                <input {...getInputProps()} />
+                                <p>{isDragActive ? t('dropCountFile', {count: draggedFiles.length}) : t('dropFilesHere')}</p>
+                            </div>
+                        )}
                     </Dropzone>
                 }
 
diff --git a/client/src/lib/sandbox-common.scss b/client/src/lib/sandbox-common.scss
index e268abb4..01c727d8 100644
--- a/client/src/lib/sandbox-common.scss
+++ b/client/src/lib/sandbox-common.scss
@@ -32,53 +32,59 @@ $editorNormalHeight: 800px !default;
   background: #f86c6b;
   width: 100%;
   height: $navbarHeight;
+  display: flex;
+  justify-content: space-between;
 }
 
-.logo {
-  float: left;
-  height: $navbarHeight;
-  padding: 5px 0 5px 10px;
-  filter: brightness(0) invert(1);
-}
+.navbarLeft {
+  .logo {
+    display: inline-block;
+    height: $navbarHeight;
+    padding: 5px 0 5px 10px;
+    filter: brightness(0) invert(1);
+  }
 
-.title {
-  padding: 5px 0 5px 10px;
-  font-size: 18px;
-  font-weight: bold;
-  float: left;
-  color: white;
-  height: $navbarHeight;
-}
-
-.btn, .btnDisabled {
-  display: block;
-  float: right;
-  padding: 0px 15px;
-  line-height: $navbarHeight;
-  text-align: center;
-  font-size: 14px;
-  font-weight: bold;
-  font-family: sans-serif;
-  cursor: pointer;
-
-  &, &:not([href]):not([tabindex]) { // This is to override reboot.scss in bootstrap
+  .title {
+    display: inline-block;
+    padding: 5px 0 5px 10px;
+    font-size: 18px;
+    font-weight: bold;
+    float: left;
     color: white;
+    height: $navbarHeight;
   }
 }
 
-.btn:hover {
-  background-color: #c05454;
-  text-decoration: none;
+.navbarRight {
+  .btn, .btnDisabled {
+    display: inline-block;
+    padding: 0px 15px;
+    line-height: $navbarHeight;
+    text-align: center;
+    font-size: 14px;
+    font-weight: bold;
+    font-family: sans-serif;
+    cursor: pointer;
 
-  &, &:not([href]):not([tabindex]) { // This is to override reboot.scss in bootstrap
-    color: white;
-  }
-}
-
-.btnDisabled {
-  cursor: default;
-
-  &, &:not([href]):not([tabindex]) { // This is to override reboot.scss in bootstrap
-    color: #621d1d;
+    &, &:not([href]):not([tabindex]) { // This is to override reboot.scss in bootstrap
+      color: white;
+    }
+  }
+
+  .btn:hover {
+    background-color: #c05454;
+    text-decoration: none;
+
+    &, &:not([href]):not([tabindex]) { // This is to override reboot.scss in bootstrap
+      color: white;
+    }
+  }
+
+  .btnDisabled {
+    cursor: default;
+
+    &, &:not([href]):not([tabindex]) { // This is to override reboot.scss in bootstrap
+      color: #621d1d;
+    }
   }
 }
diff --git a/client/src/lib/sandboxed-ckeditor.js b/client/src/lib/sandboxed-ckeditor.js
index 21b863cb..19259dd2 100644
--- a/client/src/lib/sandboxed-ckeditor.js
+++ b/client/src/lib/sandboxed-ckeditor.js
@@ -94,11 +94,15 @@ export class CKEditorHost extends Component {
         return (
             <div className={this.state.fullscreen ? styles.editorFullscreen : styles.editor}>
                 <div className={styles.navbar}>
-                    {this.state.fullscreen && <img className={styles.logo} src={getTrustedUrl('static/mailtrain-notext.png')}/>}
-                    <div className={styles.title}>{this.props.title}</div>
-                    <a className={styles.btn} onClick={::this.toggleFullscreenAsync}><Icon icon="window-maximize"/></a>
-                    <a className={styles.btn} onClick={this.props.onTestSend}><Icon icon="send"/></a>
-                    {this.props.canSave ? <a className={styles.btn} onClick={this.props.onSave}><Icon icon="floppy-disk"/></a> : <span className={styles.btnDisabled}><Icon icon="floppy-disk"/></span>}
+                    <div className={styles.navbarLeft}>
+                        {this.state.fullscreen && <img className={styles.logo} src={getTrustedUrl('static/mailtrain-notext.png')}/>}
+                        <div className={styles.title}>{this.props.title}</div>
+                    </div>
+                    <div className={styles.navbarRight}>
+                        {this.props.canSave ? <a className={styles.btn} onClick={this.props.onSave} title={t('Save')}><Icon icon="save"/></a> : <span className={styles.btnDisabled}><Icon icon="save"/></span>}
+                        <a className={styles.btn} onClick={this.props.onTestSend} title={t('Send test e-mail')}><Icon icon="at"/></a>
+                        <a className={styles.btn} onClick={::this.toggleFullscreenAsync} title={t('Maximize editor')}><Icon icon="window-maximize"/></a>
+                    </div>
                 </div>
                 <UntrustedContentHost ref={node => this.contentNode = node} className={styles.host} singleToken={true} contentProps={editorData} contentSrc="ckeditor/editor" tokenMethod="ckeditor" tokenParams={editorData}/>
             </div>
diff --git a/client/src/lib/sandboxed-codeeditor.js b/client/src/lib/sandboxed-codeeditor.js
index b9ea9f25..7bb21fe0 100644
--- a/client/src/lib/sandboxed-codeeditor.js
+++ b/client/src/lib/sandboxed-codeeditor.js
@@ -88,13 +88,17 @@ export class CodeEditorHost extends Component {
         return (
             <div className={this.state.fullscreen ? styles.editorFullscreen : styles.editor}>
                 <div className={styles.navbar}>
-                    {this.state.fullscreen && <img className={styles.logo} src={getTrustedUrl('static/mailtrain-notext.png')}/>}
-                    <div className={styles.title}>{this.props.title}</div>
-                    <a className={styles.btn} onClick={::this.toggleFullscreenAsync}><Icon icon="window-maximize"/></a>
-                    <a className={styles.btn} onClick={this.props.onTestSend}><Icon icon="send"/></a>
-                    <a className={styles.btn} onClick={::this.togglePreviewAsync}><Icon icon={this.state.preview ? 'eye-close': 'eye-open'}/></a>
-                    {this.props.canSave ? <a className={styles.btn} onClick={this.props.onSave}><Icon icon="floppy-disk"/></a> : <span className={styles.btnDisabled}><Icon icon="floppy-disk"/></span>}
-                    <a className={styles.btn} onClick={::this.toggleWrapAsync}>{this.state.wrap ? 'WRAP': 'NOWRAP'}</a>
+                    <div className={styles.navbarLeft}>
+                        {this.state.fullscreen && <img className={styles.logo} src={getTrustedUrl('static/mailtrain-notext.png')}/>}
+                        <div className={styles.title}>{this.props.title}</div>
+                    </div>
+                    <div className={styles.navbarRight}>
+                        <a className={styles.btn} onClick={::this.toggleWrapAsync} title={this.state.wrap ? t('Disable word wrap') : t('Enable word wrap')}>{this.state.wrap ? 'WRAP': 'NOWRAP'}</a>
+                        {this.props.canSave ? <a className={styles.btn} onClick={this.props.onSave} title={t('Save')}><Icon icon="save"/></a> : <span className={styles.btnDisabled}><Icon icon="floppy-disk"/></span>}
+                        <a className={styles.btn} onClick={this.props.onTestSend} title={t('Send test e-mail')}><Icon icon="at"/></a>
+                        <a className={styles.btn} onClick={::this.togglePreviewAsync} title={this.state.preview ? t('Hide preview'): t('Show preview')}><Icon icon={this.state.preview ? 'eye-slash': 'eye'}/></a>
+                        <a className={styles.btn} onClick={::this.toggleFullscreenAsync} title={t('Maximize editor')}><Icon icon="window-maximize"/></a>
+                    </div>
                 </div>
                 <UntrustedContentHost ref={node => this.contentNode = node} className={styles.host} singleToken={true} contentProps={editorData} contentSrc="codeeditor/editor" tokenMethod="codeeditor" tokenParams={tokenData}/>
             </div>
diff --git a/client/src/lib/sandboxed-grapesjs.js b/client/src/lib/sandboxed-grapesjs.js
index d7c3de2e..b7e4bdb9 100644
--- a/client/src/lib/sandboxed-grapesjs.js
+++ b/client/src/lib/sandboxed-grapesjs.js
@@ -68,11 +68,15 @@ export class GrapesJSHost extends Component {
         return (
             <div className={this.state.fullscreen ? styles.editorFullscreen : styles.editor}>
                 <div className={styles.navbar}>
-                    {this.state.fullscreen && <img className={styles.logo} src={getTrustedUrl('static/mailtrain-notext.png')}/>}
-                    <div className={styles.title}>{this.props.title}</div>
-                    <a className={styles.btn} onClick={::this.toggleFullscreenAsync}><Icon icon="window-maximize"/></a>
-                    <a className={styles.btn} onClick={this.props.onTestSend}><Icon icon="send"/></a>
-                    {this.props.canSave ? <a className={styles.btn} onClick={this.props.onSave}><Icon icon="floppy-disk"/></a> : <span className={styles.btnDisabled}><Icon icon="floppy-disk"/></span>}
+                    <div className={styles.navbarLeft}>
+                        {this.state.fullscreen && <img className={styles.logo} src={getTrustedUrl('static/mailtrain-notext.png')}/>}
+                        <div className={styles.title}>{this.props.title}</div>
+                    </div>
+                    <div className={styles.navbarRight}>
+                        {this.props.canSave ? <a className={styles.btn} onClick={this.props.onSave} title={t('Save')}><Icon icon="save"/></a> : <span className={styles.btnDisabled}><Icon icon="save"/></span>}
+                        <a className={styles.btn} onClick={this.props.onTestSend} title={t('Send test e-mail')}><Icon icon="at"/></a>
+                        <a className={styles.btn} onClick={::this.toggleFullscreenAsync} title={t('Maximize editor')}><Icon icon="window-maximize"/></a>
+                    </div>
                 </div>
                 <UntrustedContentHost ref={node => this.contentNode = node} className={styles.host} singleToken={true} contentProps={editorData} contentSrc="grapesjs/editor" tokenMethod="grapesjs" tokenParams={tokenData}/>
             </div>
diff --git a/client/src/lib/sandboxed-mosaico.js b/client/src/lib/sandboxed-mosaico.js
index ce0c4271..6a9281fe 100644
--- a/client/src/lib/sandboxed-mosaico.js
+++ b/client/src/lib/sandboxed-mosaico.js
@@ -71,11 +71,15 @@ export class MosaicoHost extends Component {
         return (
             <div className={this.state.fullscreen ? styles.editorFullscreen : styles.editor}>
                 <div className={styles.navbar}>
-                    {this.state.fullscreen && <img className={styles.logo} src={getTrustedUrl('static/mailtrain-notext.png')}/>}
-                    <div className={styles.title}>{this.props.title}</div>
-                    <a className={styles.btn} onClick={::this.toggleFullscreenAsync}><Icon icon="window-maximize"/></a>
-                    <a className={styles.btn} onClick={this.props.onTestSend}><Icon icon="send"/></a>
-                    {this.props.canSave ? <a className={styles.btn} onClick={this.props.onSave}><Icon icon="floppy-disk"/></a> : <span className={styles.btnDisabled}><Icon icon="floppy-disk"/></span>}
+                    <div className={styles.navbarLeft}>
+                        {this.state.fullscreen && <img className={styles.logo} src={getTrustedUrl('static/mailtrain-notext.png')}/>}
+                        <div className={styles.title}>{this.props.title}</div>
+                    </div>
+                    <div className={styles.navbarRight}>
+                        {this.props.canSave ? <a className={styles.btn} onClick={this.props.onSave} title={t('Save')}><Icon icon="save"/></a> : <span className={styles.btnDisabled}><Icon icon="save"/></span>}
+                        <a className={styles.btn} onClick={this.props.onTestSend} title={t('Send test e-mail')}><Icon icon="at"/></a>
+                        <a className={styles.btn} onClick={::this.toggleFullscreenAsync} title={t('Maximize editor')}><Icon icon="window-maximize"/></a>
+                    </div>
                 </div>
                 <UntrustedContentHost ref={node => this.contentNode = node} className={styles.host} singleToken={true} contentProps={editorData} contentSrc="mosaico/editor" tokenMethod="mosaico" tokenParams={tokenData}/>
             </div>
diff --git a/client/src/lib/styles.scss b/client/src/lib/styles.scss
index 155bb70e..47eb7f76 100644
--- a/client/src/lib/styles.scss
+++ b/client/src/lib/styles.scss
@@ -123,6 +123,10 @@
   text-align: center;
   font-size: 20px;
   color: #808080;
+
+  p:last-child {
+    margin-bottom: 0px;
+  }
 }
 
 .dropZoneActive{
diff --git a/client/src/lists/fields/List.js b/client/src/lists/fields/List.js
index a7901077..d94a1045 100644
--- a/client/src/lists/fields/List.js
+++ b/client/src/lists/fields/List.js
@@ -51,7 +51,7 @@ export default class List extends Component {
         const columns = [
             { data: 4, title: "#" },
             { data: 1, title: t('name'),
-                render: (data, cmd, rowData) => rowData[2] === 'option' ? <span><Icon icon="record"/> {data}</span> : data
+                render: (data, cmd, rowData) => rowData[2] === 'option' ? <span><Icon icon="dot-circle"/> {data}</span> : data
             },
             { data: 2, title: t('type'), render: data => this.fieldTypes[data].label, sortable: false, searchable: false },
             { data: 3, title: t('mergeTag') },
diff --git a/server/models/fields.js b/server/models/fields.js
index 20f9adef..4551a248 100644
--- a/server/models/fields.js
+++ b/server/models/fields.js
@@ -88,7 +88,7 @@ fieldTypes.gpg = {
 
 fieldTypes.json = {
     validate: field => {},
-    addColumn: (table, name) => table.json(name),
+    addColumn: (table, name) => table.text(name),
     indexed: false,
     grouped: false,
     enumerated: false,