diff --git a/src/block_manager/view/BlockView.js b/src/block_manager/view/BlockView.js
index 5e3666185..ef6608c60 100644
--- a/src/block_manager/view/BlockView.js
+++ b/src/block_manager/view/BlockView.js
@@ -39,10 +39,11 @@ function(Backbone) {
     },
 
     render: function() {
-      this.el.innerHTML = this.model.get('label');
-      this.$el.addClass(this.ppfx + 'block');
+      var className = this.ppfx + 'block';
+      this.$el.addClass(className);
+      this.el.innerHTML = '<div class="' + className + '-label">' + this.model.get('label') + '</div>';
       return this;
     },
 
   });
-});
\ No newline at end of file
+});
diff --git a/src/dom_components/model/ComponentLink.js b/src/dom_components/model/ComponentLink.js
index 89247f5bb..5f29f40ac 100644
--- a/src/dom_components/model/ComponentLink.js
+++ b/src/dom_components/model/ComponentLink.js
@@ -1,11 +1,10 @@
-define(['./Component'],
+define(['./ComponentText'],
 	function (Component) {
 
 		return Component.extend({
 
 			defaults: _.extend({}, Component.prototype.defaults, {
 					tagName: 'a',
-					droppable: false,
 					traits: ['title', 'href', 'target'],
 			}),
 
diff --git a/src/editor/config/config.js b/src/editor/config/config.js
index c1806cdc1..9c540d296 100644
--- a/src/editor/config/config.js
+++ b/src/editor/config/config.js
@@ -176,6 +176,15 @@ define(function () {
 	        label: 'Quote',
 	        content: '<blockquote class="quote">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore ipsum dolor sit</blockquote>',
 	        attributes: {class:'gjs-fonts gjs-f-quo'}
+	      },{
+					id: 'link',
+	        label: 'Link',
+	        attributes: {class:'fa fa-link'},
+	        content: {
+						type:'link',
+						content:'Link',
+						style:{color: '#d983a6'}
+					},
 	      }],
 		},
 
diff --git a/styles/css/main.css b/styles/css/main.css
index d82823742..81a35b479 100644
--- a/styles/css/main.css
+++ b/styles/css/main.css
@@ -3522,6 +3522,17 @@ ol.example li.placeholder:before {
   flex-direction: column;
   justify-content: flex-end; }
 
+.gjs-block.fa {
+  font-size: 2em;
+  line-height: 2em;
+  padding: 11px; }
+
+.gjs-block-label {
+  line-height: normal;
+  font-size: 0.65rem;
+  font-weight: normal;
+  font-family: Helvetica, sans-serif; }
+
 .gjs-block.gjs-bdrag {
   width: auto;
   padding: 0; }
diff --git a/styles/scss/main.scss b/styles/scss/main.scss
index f1cbd039f..e3e5d21bc 100644
--- a/styles/scss/main.scss
+++ b/styles/scss/main.scss
@@ -1125,6 +1125,19 @@ $arrowColor:    $mainLhlColor; /*b1b1b1*/
   justify-content: flex-end;
 }
 
+.#{$app-prefix}block.fa {
+  font-size: 2em;
+  line-height: 2em;
+  padding: 11px;
+}
+
+.#{$app-prefix}block-label {
+  line-height: normal;
+  font-size: 0.65rem;
+  font-weight: normal;
+  font-family: Helvetica, sans-serif;
+}
+
 .#{$app-prefix}block.#{$app-prefix}bdrag{
  width: auto;
  padding: 0;