diff --git a/Controls.LookupGrid/LookupControl2.vb b/Controls.LookupGrid/LookupControl2.vb
index 24aa6677..ba7b1f9a 100644
--- a/Controls.LookupGrid/LookupControl2.vb
+++ b/Controls.LookupGrid/LookupControl2.vb
@@ -62,8 +62,6 @@ Public Class LookupControl2
 
     Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView
     Friend WithEvents GridView2 As DevExpress.XtraGrid.Views.Grid.GridView
-    Friend WithEvents fProperties As RepositoryItemGridLookUpEdit
-    Friend WithEvents fPropertiesView As DevExpress.XtraGrid.Views.Grid.GridView
     Private _ReadOnly As Boolean = False
 
     Shared Sub New()
@@ -76,8 +74,9 @@ Public Class LookupControl2
 
     Public Sub New(MultiSelect As Boolean)
         _LookupFormButton = New EditorButton() With {
-            .Kind = ButtonPredefines.Ellipsis,
-            .Tag = TAG_BUTTON_LOOKUP_FORM
+            .Kind = ButtonPredefines.Search,
+            .Tag = TAG_BUTTON_LOOKUP_FORM,
+            .Width = 20
         }
 
         Properties.Buttons.Item(0).Tag = TAG_DROPDOWN
@@ -199,31 +198,6 @@ Public Class LookupControl2
             Return RepositoryItemLookupControl2.CustomEditName
         End Get
     End Property
-
-    Private Sub InitializeComponent()
-        Me.fProperties = New DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit()
-        Me.fPropertiesView = New DevExpress.XtraGrid.Views.Grid.GridView()
-        CType(Me.fProperties, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.fPropertiesView, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.SuspendLayout()
-        '
-        'fProperties
-        '
-        Me.fProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
-        Me.fProperties.Name = "fProperties"
-        Me.fProperties.PopupView = Me.fPropertiesView
-        '
-        'fPropertiesView
-        '
-        Me.fPropertiesView.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus
-        Me.fPropertiesView.Name = "fPropertiesView"
-        Me.fPropertiesView.OptionsSelection.EnableAppearanceFocusedCell = False
-        Me.fPropertiesView.OptionsView.ShowGroupPanel = False
-        CType(Me.fProperties, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.fPropertiesView, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.ResumeLayout(False)
-
-    End Sub
 End Class
 
 <UserRepositoryItem("RegisterLookupControl2")>
@@ -244,7 +218,18 @@ Public Class RepositoryItemLookupControl2
 
     Public Shared Sub RegisterLookupControl2()
         Dim img As Image = Nothing
-        EditorRegistrationInfo.Default.Editors.Add(New EditorClassInfo(CustomEditName, GetType(LookupControl2), GetType(RepositoryItemLookupControl2), GetType(GridLookUpEditBaseViewInfo), New ButtonEditPainter(), True, img, GetType(ButtonEditAccessible)))
+        EditorRegistrationInfo.Default.Editors.Add(
+            New EditorClassInfo(
+                CustomEditName,
+                GetType(LookupControl2),
+                GetType(RepositoryItemLookupControl2),
+                GetType(GridLookUpEditBaseViewInfo),
+                New ButtonEditPainter(),
+                True,
+                img,
+                GetType(ButtonEditAccessible)
+            )
+        )
     End Sub
 
     Public Overrides Sub Assign(item As RepositoryItem)