diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/FontPanel.form b/trunk/src/com/jpexs/decompiler/flash/gui/FontPanel.form
index 35d855e1e..ab65ac4e6 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/FontPanel.form
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/FontPanel.form
@@ -71,7 +71,7 @@
               </Group>
               <EmptySpace max="-2" attributes="0"/>
               <Component id="fontEmbedButton" min="-2" max="-2" attributes="0"/>
-              <EmptySpace pref="32" max="32767" attributes="0"/>
+              <EmptySpace pref="30" max="32767" attributes="0"/>
               <Group type="103" groupAlignment="3" attributes="0">
                   <Component id="buttonEdit" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="buttonSave" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -462,6 +462,9 @@
     </Component>
     <Component class="javax.swing.JButton" name="buttonEdit">
       <Properties>
+        <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+          <Image iconType="3" name="/com/jpexs/decompiler/flash/gui/graphics/edit16.png"/>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="com/jpexs/decompiler/flash/gui/locales/MainFrame.properties" key="button.edit" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
         </Property>
@@ -472,6 +475,9 @@
     </Component>
     <Component class="javax.swing.JButton" name="buttonSave">
       <Properties>
+        <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+          <Image iconType="3" name="/com/jpexs/decompiler/flash/gui/graphics/save16.png"/>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="com/jpexs/decompiler/flash/gui/locales/MainFrame.properties" key="button.save" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
         </Property>
@@ -482,6 +488,9 @@
     </Component>
     <Component class="javax.swing.JButton" name="buttonCancel">
       <Properties>
+        <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+          <Image iconType="3" name="/com/jpexs/decompiler/flash/gui/graphics/cancel16.png"/>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="com/jpexs/decompiler/flash/gui/locales/MainFrame.properties" key="button.cancel" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
         </Property>
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/FontPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/FontPanel.java
index a6d20ab18..22bd184a2 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/FontPanel.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/FontPanel.java
@@ -425,6 +425,7 @@ public class FontPanel extends javax.swing.JPanel {
             }
         });
 
+        buttonEdit.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jpexs/decompiler/flash/gui/graphics/edit16.png"))); // NOI18N
         buttonEdit.setText(bundle.getString("button.edit")); // NOI18N
         buttonEdit.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -432,6 +433,7 @@ public class FontPanel extends javax.swing.JPanel {
             }
         });
 
+        buttonSave.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jpexs/decompiler/flash/gui/graphics/save16.png"))); // NOI18N
         buttonSave.setText(bundle.getString("button.save")); // NOI18N
         buttonSave.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -439,6 +441,7 @@ public class FontPanel extends javax.swing.JPanel {
             }
         });
 
+        buttonCancel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jpexs/decompiler/flash/gui/graphics/cancel16.png"))); // NOI18N
         buttonCancel.setText(bundle.getString("button.cancel")); // NOI18N
         buttonCancel.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -495,7 +498,7 @@ public class FontPanel extends javax.swing.JPanel {
                     .addComponent(fontSelection, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(fontEmbedButton)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 32, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 30, Short.MAX_VALUE)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(buttonEdit)
                     .addComponent(buttonSave)
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/MainPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/MainPanel.java
index 8a952b8dd..a431f9709 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/MainPanel.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/MainPanel.java
@@ -2238,6 +2238,7 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
             if (tagObj instanceof TextTag) {
                 TextTag textTag = (TextTag) tagObj;
                 parametersPanel.setVisible(true);
+                previewSplitPane.setDividerLocation(Configuration.guiPreviewSplitPaneDividerLocation.get(previewSplitPane.getWidth() / 2));
                 showDetailWithPreview(CARDTEXTPANEL);
                 textValue.setContentType("text/swf_text");
                 textValue.setText(textTag.getFormattedText(textTag.getSwf().tags));
@@ -2640,6 +2641,7 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
         }
 
         parametersPanel.setVisible(true);
+        previewSplitPane.setDividerLocation(Configuration.guiPreviewSplitPaneDividerLocation.get(previewSplitPane.getWidth() / 2));
         fontPanel.showFontTag(ft);
         showDetailWithPreview(CARDFONTPANEL);
     }