diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index fcace744a0..9f67266150 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -319,42 +319,27 @@
   /*
         Link to / Selector Widget
 */
-  .et2_link_to {
-    min-height: 78px;
+  .et2_link_to.et2_toolbar {
+    margin-top: 2px !important;
+  }
+  .et2_link_to .et2_link_entry select,
+  .et2_link_to .et2_link_entry input,
+  .et2_link_to .et2_link_entry button {
+    padding: 0;
+    padding-left: 4px;
   }
   .et2_link_to .et2_link_entry .ui-icon-close {
     background-color: transparent;
     left: 0px;
   }
-  .et2_link_to button.et2_vfs_btn {
-    vertical-align: middle;
-    background-position: center;
-    padding: 0 !important;
-    background-size: 16px;
-    margin-top: -1px;
-    margin-right: 0px;
-  }
   .et2_link_to .et2_file span {
     background-image: url("../images/add.png");
-    background-position: 4px 2px;
+    background-position: center;
     background-size: 16px 16px;
     background-repeat: no-repeat;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-  }
-  .et2_link_to .et2_file span:hover {
-    background-color: #1aa200 !important;
-  }
-  .et2_link_to .et2_file span:active {
-    background-color: #1aa200 !important;
-  }
-  .et2_link_to .et2_file span.et2_file_spanActive {
-    background-color: #1aa200 !important;
-  }
-  .et2_link_to .et2_file input {
-    border: none;
-    padding: 1em;
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;
   }
   .et2_link {
     color: #0c5da5;
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index 494a49325e..c43c3ca0a8 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -308,42 +308,27 @@
   /*
         Link to / Selector Widget
 */
-  .et2_link_to {
-    min-height: 78px;
+  .et2_link_to.et2_toolbar {
+    margin-top: 2px !important;
+  }
+  .et2_link_to .et2_link_entry select,
+  .et2_link_to .et2_link_entry input,
+  .et2_link_to .et2_link_entry button {
+    padding: 0;
+    padding-left: 4px;
   }
   .et2_link_to .et2_link_entry .ui-icon-close {
     background-color: transparent;
     left: 0px;
   }
-  .et2_link_to button.et2_vfs_btn {
-    vertical-align: middle;
-    background-position: center;
-    padding: 0 !important;
-    background-size: 16px;
-    margin-top: -1px;
-    margin-right: 0px;
-  }
   .et2_link_to .et2_file span {
     background-image: url("../images/add.png");
-    background-position: 4px 2px;
+    background-position: center;
     background-size: 16px 16px;
     background-repeat: no-repeat;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-  }
-  .et2_link_to .et2_file span:hover {
-    background-color: #1aa200 !important;
-  }
-  .et2_link_to .et2_file span:active {
-    background-color: #1aa200 !important;
-  }
-  .et2_link_to .et2_file span.et2_file_spanActive {
-    background-color: #1aa200 !important;
-  }
-  .et2_link_to .et2_file input {
-    border: none;
-    padding: 1em;
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;
   }
   .et2_link {
     color: #0c5da5;
diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less
index 3f18a6eebd..505e5984c9 100755
--- a/pixelegg/less/etemplate2.less
+++ b/pixelegg/less/etemplate2.less
@@ -279,10 +279,10 @@ div.et2_file input.et2_file_upload{
 /*
         Link to / Selector Widget
 */
+.et2_link_to.et2_toolbar {margin-top: 2px !important;}
 .et2_link_to {
-	min-height: 78px;
-	// right select field - icon after
 	.et2_link_entry {
+		select, input, button {padding:0; padding-left:4px;}
 		.ui-icon-close {
 			background-color: transparent;
 			left: 0px;
@@ -295,30 +295,15 @@ div.et2_file input.et2_file_upload{
 	// next line - left
 	// et2_vfs_btn
 	button.et2_vfs_btn {
-		vertical-align: middle;
-		background-position: center;
-		padding: 0 !important;
-		background-size: 16px;
-		margin-top: -1px;
-		margin-right:0px;
+
 	}
-
 	.et2_file {
-
 		span {
 		background-image: url("../images/add.png");
-			background-position: 4px 2px;
+			background-position: center;
 			background-size: 16px 16px;
 			background-repeat: no-repeat;
-			.rounded (5px);
-
-			&:hover {background-color: @color_positive_action_active !important;}
-			&:active {background-color: @color_positive_action_active !important;}
-		}
-		span.et2_file_spanActive{background-color: @color_positive_action_active !important;}
-		input{
-			border: none;
-			padding: 1em;
+			.rounded (3px);
 		}
 	}
 }
diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css
index 144ca28119..c08f6c34ba 100644
--- a/pixelegg/mobile/fw_mobile.css
+++ b/pixelegg/mobile/fw_mobile.css
@@ -330,42 +330,27 @@
   /*
         Link to / Selector Widget
 */
-  .et2_link_to {
-    min-height: 78px;
+  .et2_link_to.et2_toolbar {
+    margin-top: 2px !important;
+  }
+  .et2_link_to .et2_link_entry select,
+  .et2_link_to .et2_link_entry input,
+  .et2_link_to .et2_link_entry button {
+    padding: 0;
+    padding-left: 4px;
   }
   .et2_link_to .et2_link_entry .ui-icon-close {
     background-color: transparent;
     left: 0px;
   }
-  .et2_link_to button.et2_vfs_btn {
-    vertical-align: middle;
-    background-position: center;
-    padding: 0 !important;
-    background-size: 16px;
-    margin-top: -1px;
-    margin-right: 0px;
-  }
   .et2_link_to .et2_file span {
     background-image: url("../images/add.png");
-    background-position: 4px 2px;
+    background-position: center;
     background-size: 16px 16px;
     background-repeat: no-repeat;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-  }
-  .et2_link_to .et2_file span:hover {
-    background-color: #1aa200 !important;
-  }
-  .et2_link_to .et2_file span:active {
-    background-color: #1aa200 !important;
-  }
-  .et2_link_to .et2_file span.et2_file_spanActive {
-    background-color: #1aa200 !important;
-  }
-  .et2_link_to .et2_file input {
-    border: none;
-    padding: 1em;
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;
   }
   .et2_link {
     color: #0c5da5;