diff --git a/src/com/jpexs/decompiler/flash/gui/GridDialog.java b/src/com/jpexs/decompiler/flash/gui/GridDialog.java
index 60ecba622..f96910fec 100644
--- a/src/com/jpexs/decompiler/flash/gui/GridDialog.java
+++ b/src/com/jpexs/decompiler/flash/gui/GridDialog.java
@@ -18,7 +18,6 @@ package com.jpexs.decompiler.flash.gui;
 
 import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.configuration.enums.GridSnapAccuracy;
-import com.jpexs.decompiler.flash.configuration.enums.GuidesSnapAccuracy;
 import java.awt.BorderLayout;
 import java.awt.Container;
 import java.awt.GridBagConstraints;
@@ -43,13 +42,13 @@ import javax.swing.JTextField;
  * @author JPEXS
  */
 public class GridDialog extends AppDialog {
-    private ConfigurationColorSelection colorSelection;
-    private JCheckBox showGridCheckBox;
-    private JCheckBox snapToGridCheckBox;
-    private JCheckBox showOverObjectsCheckBox;
-    private JComboBox<AcurracyItem> snapAccuracyComboBox;
-    private JTextField spacingXTextField;
-    private JTextField spacingYTextField;
+    private final ConfigurationColorSelection colorSelection;
+    private final JCheckBox showGridCheckBox;
+    private final JCheckBox snapToGridCheckBox;
+    private final JCheckBox showOverObjectsCheckBox;
+    private final JComboBox<AcurracyItem> snapAccuracyComboBox;
+    private final JTextField spacingXTextField;
+    private final JTextField spacingYTextField;
     
     public GridDialog(Window owner) {
         super(owner);
@@ -70,6 +69,7 @@ public class GridDialog extends AppDialog {
         centralPanel.add(colorLabel, c);
         
         colorSelection = new ConfigurationColorSelection(Configuration.gridColor, Configuration.gridColor.get(), null);
+        colorLabel.setLabelFor(colorSelection);
         c.gridx = 1;
         c.anchor = GridBagConstraints.LINE_START;        
         centralPanel.add(colorSelection, c);
@@ -96,7 +96,8 @@ public class GridDialog extends AppDialog {
         centralPanel.add(spacingXLabel, c);
         
         spacingXTextField = new JTextField(10);
-        spacingXTextField.setText("" + Configuration.gridHorizontalSpace.get());
+        spacingXLabel.setLabelFor(spacingXTextField);
+        spacingXTextField.setText("" + Configuration.gridHorizontalSpace.get());        
         c.gridx++;
         c.anchor = GridBagConstraints.LINE_START;
         centralPanel.add(spacingXTextField, c);
@@ -108,6 +109,7 @@ public class GridDialog extends AppDialog {
         centralPanel.add(spacingYLabel, c);
         
         spacingYTextField = new JTextField(10);
+        spacingYLabel.setLabelFor(spacingYTextField);
         spacingYTextField.setText("" + Configuration.gridVerticalSpace.get());
         c.gridx++;
         c.anchor = GridBagConstraints.LINE_START;
@@ -127,6 +129,7 @@ public class GridDialog extends AppDialog {
                     new AcurracyItem(GridSnapAccuracy.ALWAYS_SNAP)
                 }
         );
+        snapAccuracyLabel.setLabelFor(snapAccuracyComboBox);
         
         snapAccuracyComboBox.setSelectedItem(new AcurracyItem(Configuration.gridSnapAccuracy.get()));
         
diff --git a/src/com/jpexs/decompiler/flash/gui/GuidesDialog.java b/src/com/jpexs/decompiler/flash/gui/GuidesDialog.java
index acb01df33..744701e08 100644
--- a/src/com/jpexs/decompiler/flash/gui/GuidesDialog.java
+++ b/src/com/jpexs/decompiler/flash/gui/GuidesDialog.java
@@ -69,6 +69,7 @@ public class GuidesDialog extends AppDialog {
         centralPanel.add(colorLabel, c);
         
         colorSelection = new ConfigurationColorSelection(Configuration.guidesColor, Configuration.guidesColor.get(), null);
+        colorLabel.setLabelFor(colorSelection);
         c.gridx = 1;
         c.anchor = GridBagConstraints.LINE_START;        
         centralPanel.add(colorSelection, c);
@@ -101,6 +102,7 @@ public class GuidesDialog extends AppDialog {
                     new AcurracyItem(GuidesSnapAccuracy.CAN_BE_DISTANT)
                 }
         );
+        snapAccuracyLabel.setLabelFor(snapAccuracyComboBox);
         
         snapAccuracyComboBox.setSelectedItem(new AcurracyItem(Configuration.guidesSnapAccuracy.get()));
         
diff --git a/src/com/jpexs/decompiler/flash/gui/SnappingDialog.java b/src/com/jpexs/decompiler/flash/gui/SnappingDialog.java
index 4e201e991..cb078c562 100644
--- a/src/com/jpexs/decompiler/flash/gui/SnappingDialog.java
+++ b/src/com/jpexs/decompiler/flash/gui/SnappingDialog.java
@@ -125,6 +125,8 @@ public class SnappingDialog extends AppDialog {
         snapAlignPanel.add(stageBorderLabel, c);
 
         stageBorderTextField = new JTextField(10);
+        stageBorderLabel.setLabelFor(stageBorderTextField);
+        
         stageBorderTextField.setText("" + Configuration.snapAlignStageBorder.get());
         c.gridx++;
         c.anchor = GridBagConstraints.LINE_START;
@@ -140,7 +142,8 @@ public class SnappingDialog extends AppDialog {
         snapAlignPanel.add(objectHorizontalSpacingLabel, c);
 
         objectHorizontalSpacingTextField = new JTextField(10);
-        objectHorizontalSpacingTextField.setText("" + Configuration.snapAlignObjectHorizontalSpace.get());
+        objectHorizontalSpacingLabel.setLabelFor(objectHorizontalSpacingTextField);
+        objectHorizontalSpacingTextField.setText("" + Configuration.snapAlignObjectHorizontalSpace.get());        
         
         c.gridx++;
         c.anchor = GridBagConstraints.LINE_START;
@@ -152,7 +155,9 @@ public class SnappingDialog extends AppDialog {
         snapAlignPanel.add(objectVerticalSpacingLabel, c);
 
         objectVerticalSpacingTextField = new JTextField(10);
+        objectVerticalSpacingLabel.setLabelFor(objectVerticalSpacingTextField);
         objectVerticalSpacingTextField.setText("" + Configuration.snapAlignObjectVerticalSpace.get());
+        
         c.gridx++;
         c.anchor = GridBagConstraints.LINE_START;
         snapAlignPanel.add(objectVerticalSpacingTextField, c);