diff --git a/gelectrical/icons/wire-symbolic.svg b/gelectrical/icons/wiredraw-symbolic.svg
similarity index 100%
rename from gelectrical/icons/wire-symbolic.svg
rename to gelectrical/icons/wiredraw-symbolic.svg
diff --git a/gelectrical/interface/mainwindow.glade b/gelectrical/interface/mainwindow.glade
index 0ee04c6..1574887 100755
--- a/gelectrical/interface/mainwindow.glade
+++ b/gelectrical/interface/mainwindow.glade
@@ -336,7 +336,7 @@ along with .  If not, see <http://www.gnu.org/licenses/>.
                         <property name="halign">start</property>
                         <property name="label" translatable="yes">Wire</property>
                         <property name="use-underline">True</property>
-                        <property name="icon-name">wire-symbolic</property>
+                        <property name="icon-name">wiredraw-symbolic</property>
                         <signal name="clicked" handler="on_draw_drawwire" swapped="no"/>
                         <accelerator key="w" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
                       </object>
@@ -435,8 +435,8 @@ Cross reference elements allows connecting different parts of the scheme within/
                         <property name="use-underline">True</property>
                         <property name="icon-name">zoom-in-symbolic</property>
                         <signal name="clicked" handler="on_draw_zoomin" swapped="no"/>
-                        <accelerator key="KP_Add" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
                         <accelerator key="plus" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
+                        <accelerator key="KP_Add" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -469,8 +469,8 @@ Cross reference elements allows connecting different parts of the scheme within/
                         <property name="use-underline">True</property>
                         <property name="icon-name">zoom-out-symbolic</property>
                         <signal name="clicked" handler="on_draw_zoomout" swapped="no"/>
-                        <accelerator key="minus" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
                         <accelerator key="KP_Subtract" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
+                        <accelerator key="minus" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
                       </object>
                       <packing>
                         <property name="expand">False</property>
diff --git a/gelectrical/view/field.py b/gelectrical/view/field.py
index 038f603..972db9a 100755
--- a/gelectrical/view/field.py
+++ b/gelectrical/view/field.py
@@ -63,15 +63,20 @@ def update(self, fields, caption, get_field, set_field):
         self.set_field = set_field
         
         # Add item name
+        
+        self.name_row = Gtk.ListBoxRow()
         if caption:
-            self.name_row = Gtk.ListBoxRow()
             self.name_widget = Gtk.Label('<b>' + self.caption + '</b>', xalign=0)
             self.name_widget.set_use_markup(True)
-            self.name_widget.props.margin_top = 6
-            self.name_widget.props.margin_bottom = 6
-            self.name_row.add(self.name_widget)
-            self.listbox.add(self.name_row)
-            self.field_rows.append((self.name_row, None))
+        else:
+            self.name_widget = Gtk.Separator()
+        self.name_row.props.margin_top = 6
+        self.name_row.props.margin_bottom = 6
+        self.name_row.props.margin_start = 6
+        self.name_row.props.margin_end = 6
+        self.name_row.add(self.name_widget)
+        self.listbox.add(self.name_row)
+        self.field_rows.append((self.name_row, None))
         
         # Callbacks
         def activate_callback(widget, get_field, set_field, code):
@@ -280,6 +285,8 @@ def show_image_tooltip_callback(combo, x, y, keyboard_mode, tooltip):
             if field[self.enable_code]:
                 row = Gtk.ListBoxRow()
                 row.set_tooltip_markup(field['tooltip'])
+                row.props.margin_start = 6
+                row.props.margin_end = 6
                 data_widget = None
                 # Create widgets
                 hbox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=6)
@@ -645,6 +652,7 @@ def __init__(self, parent, window_caption, fields_dict, status_enable, status_in
         action_area = self.dialog_window.get_action_area()
         
         self.notebook = Gtk.Notebook()
+        self.notebook.props.show_border = True
         content_area.pack_start(self.notebook, True, True, 0)
         action_area.props.margin_top = 12
         action_area.props.margin_bottom = 6