# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /home/tester/nbsrc/main/options.keymap
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: src/org/netbeans/modules/options/keymap/KeymapPanel.form
--- src/org/netbeans/modules/options/keymap/KeymapPanel.form Base (BASE)
+++ src/org/netbeans/modules/options/keymap/KeymapPanel.form Locally Modified (Based On LOCAL)
@@ -18,16 +18,16 @@
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" alignment="1" attributes="0">
               <Group type="103" groupAlignment="1" attributes="0">
-                  <Component id="jScrollPane1" alignment="1" pref="507" max="32767" attributes="0"/>
+                  <Component id="jScrollPane1" alignment="1" pref="540" max="32767" attributes="0"/>
                   <Group type="102" alignment="1" attributes="0">
                       <EmptySpace min="-2" max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="0" attributes="0">
-                          <Component id="jSeparator1" alignment="0" pref="501" max="32767" attributes="0"/>
+                          <Component id="jSeparator1" alignment="0" pref="528" max="32767" attributes="0"/>
                           <Component id="spShortcuts" alignment="0" min="-2" pref="175" max="-2" attributes="0"/>
                           <Group type="102" alignment="0" attributes="0">
                               <Component id="lProfile" min="-2" max="-2" attributes="0"/>
                               <EmptySpace max="-2" attributes="0"/>
-                              <Component id="cbProfile" pref="290" max="32767" attributes="0"/>
+                              <Component id="cbProfile" pref="342" max="32767" attributes="0"/>
                               <EmptySpace max="-2" attributes="0"/>
                               <Component id="manageButton" min="-2" max="-2" attributes="0"/>
                               <EmptySpace max="-2" attributes="0"/>
Index: src/org/netbeans/modules/options/keymap/ShortcutCell.form
--- src/org/netbeans/modules/options/keymap/ShortcutCell.form Base (BASE)
+++ src/org/netbeans/modules/options/keymap/ShortcutCell.form Locally Modified (Based On LOCAL)
@@ -71,6 +71,8 @@
             <LineBorder/>
           </Border>
         </Property>
+        <Property name="contentAreaFilled" type="boolean" value="false"/>
+        <Property name="horizontalTextPosition" type="int" value="0"/>
         <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
           <Dimension value="[20, 15]"/>
         </Property>
@@ -80,7 +82,6 @@
         <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
           <Dimension value="[20, 15]"/>
         </Property>
-        <Property name="rolloverEnabled" type="boolean" value="true"/>
       </Properties>
       <Events>
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="changeButtonActionPerformed"/>
Index: src/org/netbeans/modules/options/keymap/ShortcutCell.java
--- src/org/netbeans/modules/options/keymap/ShortcutCell.java Base (BASE)
+++ src/org/netbeans/modules/options/keymap/ShortcutCell.java Locally Modified (Based On LOCAL)
@@ -108,7 +108,7 @@
             @Override
             public void focusGained(FocusEvent e) {
                 changeButton.setText(""); // NOI18N
-                changeButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/options/keymap/more.png")));
+                changeButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/options/keymap/more_closed.png")));
             }
 
             @Override
@@ -195,10 +195,11 @@
         changeButton.setBackground(new java.awt.Color(204, 204, 204));
         org.openide.awt.Mnemonics.setLocalizedText(changeButton, org.openide.util.NbBundle.getMessage(ShortcutCell.class, "ShortcutCell.changeButton.text")); // NOI18N
         changeButton.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(0, 0, 0)));
+        changeButton.setContentAreaFilled(false);
+        changeButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
         changeButton.setMaximumSize(new java.awt.Dimension(20, 15));
         changeButton.setMinimumSize(new java.awt.Dimension(20, 15));
         changeButton.setPreferredSize(new java.awt.Dimension(20, 15));
-        changeButton.setRolloverEnabled(true);
         changeButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 changeButtonActionPerformed(evt);
@@ -228,14 +229,22 @@
         SwingUtilities.convertPointToScreen(p, this);
         //show special key popup
         if (popup == null) {
+            // popup was just opened - set the new icon indicating this
+            changeButton.setText(""); // NOI18N
+            changeButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/options/keymap/more_opened.png")));
             if (Utilities.isUnix()) {
                 // #156869 workaround, force HW for Linux
-                popup = PopupFactory.getSharedInstance().getPopup(null, specialkeyList, p.x, p.y);
+                popup = PopupFactory.getSharedInstance().getPopup(null, specialkeyList, p.x, p.y + tf.getHeight());
             } else {
-                popup = factory.getPopup(this, specialkeyList, p.x, p.y);
+                popup = factory.getPopup(this, specialkeyList, p.x, p.y + tf.getHeight());
             }
-        }
         popup.show();
+        } else {
+            // popup was already opened - hide it and set the new icon indicating that keyboard was hidden
+            changeButton.setText(""); // NOI18N
+            changeButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/modules/options/keymap/more_closed.png")));
+            hidePopup();
+        }
     }//GEN-LAST:event_changeButtonActionPerformed
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
Index: src/org/netbeans/modules/options/keymap/SpecialkeyPanel.form
--- src/org/netbeans/modules/options/keymap/SpecialkeyPanel.form Base (BASE)
+++ src/org/netbeans/modules/options/keymap/SpecialkeyPanel.form Locally Modified (Based On LOCAL)
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+  <Properties>
+    <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+      <Border info="org.netbeans.modules.form.compat2.border.EtchedBorderInfo">
+        <EtchetBorder/>
+      </Border>
+    </Property>
+  </Properties>
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
     <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
@@ -34,7 +41,7 @@
               </Group>
               <EmptySpace max="-2" attributes="0"/>
           </Group>
-          <Component id="tabButton" alignment="0" pref="216" max="32767" attributes="1"/>
+          <Component id="tabButton" alignment="0" pref="228" max="32767" attributes="1"/>
       </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
Index: src/org/netbeans/modules/options/keymap/SpecialkeyPanel.java
--- src/org/netbeans/modules/options/keymap/SpecialkeyPanel.java Base (BASE)
+++ src/org/netbeans/modules/options/keymap/SpecialkeyPanel.java Locally Modified (Based On LOCAL)
@@ -106,9 +106,11 @@
         downButton = new javax.swing.JButton();
         rightButton = new javax.swing.JButton();
 
+        setBorder(javax.swing.BorderFactory.createEtchedBorder());
+
         tabButton.setText("Tab"); // NOI18N
 
-        escButton.setFont(new java.awt.Font("Lucida Grande", 0, 9)); // NOI18N
+        escButton.setFont(new java.awt.Font("Lucida Grande", 0, 9));
         escButton.setText("ESC"); // NOI18N
         escButton.setAlignmentY(0.0F);
         escButton.setIconTextGap(0);
@@ -145,7 +147,7 @@
                     .add(enterButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 53, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                     .add(rightButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 53, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                 .addContainerGap())
-            .add(tabButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 216, Short.MAX_VALUE)
+            .add(tabButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 228, Short.MAX_VALUE)
         );
 
         layout.linkSize(new java.awt.Component[] {downButton, enterButton, escButton, leftButton, rightButton, upButton}, org.jdesktop.layout.GroupLayout.HORIZONTAL);
Index: src/org/netbeans/modules/options/keymap/_more.png
--- src/org/netbeans/modules/options/keymap/_more.png Base (BASE)
+++ src/org/netbeans/modules/options/keymap/_more.png Locally New
Index: src/org/netbeans/modules/options/keymap/more.png
--- src/org/netbeans/modules/options/keymap/more.png Base (BASE)
+++ src/org/netbeans/modules/options/keymap/more.png Locally Deleted
Index: src/org/netbeans/modules/options/keymap/more_closed.png
--- src/org/netbeans/modules/options/keymap/more_closed.png Base (BASE)
+++ src/org/netbeans/modules/options/keymap/more_closed.png Locally New
Index: src/org/netbeans/modules/options/keymap/more_opened.png
--- src/org/netbeans/modules/options/keymap/more_opened.png Base (BASE)
+++ src/org/netbeans/modules/options/keymap/more_opened.png Locally New