diff --git a/src/components/popover/tab/keypress-tab.component.scss b/src/components/popover/tab/keypress-tab.component.scss
index 1637f879..1a157257 100644
--- a/src/components/popover/tab/keypress-tab.component.scss
+++ b/src/components/popover/tab/keypress-tab.component.scss
@@ -1,4 +1,17 @@
 :host {
     display: flex;
     flex-direction: column;
+    .long-press-container {
+        display: flex;
+        margin-top: 3rem;
+        b {
+            margin-right: 0.6em;
+        }
+        .secondary-role {
+             width: 135px;
+        }
+        icon {
+            margin-left: 0.6em;
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/components/popover/tab/keypress-tab.component.ts b/src/components/popover/tab/keypress-tab.component.ts
index 1ccd7cb6..154bf246 100644
--- a/src/components/popover/tab/keypress-tab.component.ts
+++ b/src/components/popover/tab/keypress-tab.component.ts
@@ -8,6 +8,8 @@ import { KeystrokeModifiersAction } from '../../../../config-serializer/config-i
 import { KeystrokeWithModifiersAction } from '../../../../config-serializer/config-items/KeystrokeWithModifiersAction';
 import { KeyActionSaver } from '../key-action-saver';
 
+import {IconComponent} from '../widgets/icon.component';
+
 @Component({
     moduleId: module.id,
     selector: 'keypress-tab',
@@ -35,9 +37,9 @@ import { KeyActionSaver } from '../key-action-saver';
                 </div>
             </div>
         </div>
-        <div style="margin-top: 3rem;">
+        <div class="long-press-container">
             <b class="setting-label" style="position:relative;">Long press action:</b>
-            <select class="secondary-role" style="width:135px">
+            <select class="secondary-role">
                     <option> None </option>
                     <optgroup label="Modifiers">
                         <option> LShift </option>
@@ -55,13 +57,11 @@ import { KeyActionSaver } from '../key-action-saver';
                         <option> Fn </option>
                      </optgroup>
             </select>
-            <i class="fa fa-question-circle" style="margin-left:5px" data-toggle="tooltip" data-placement="right"
-                    title="This action happens when the key is being held along with another key.">
-            </i>
+            <icon name="question-circle" title="This action happens when the key is being held along with another key."></icon>
         </div>
     `,
     styles: [require('./keypress-tab.component.scss')],
-    directives: [CaptureKeystrokeButtonComponent]
+    directives: [CaptureKeystrokeButtonComponent, IconComponent]
 })
 export class KeypressTabComponent implements OnInit, KeyActionSaver {
     private leftModifiers: string[];
diff --git a/src/components/popover/widgets/icon.component.ts b/src/components/popover/widgets/icon.component.ts
index 4bcfaa4e..bf98447c 100644
--- a/src/components/popover/widgets/icon.component.ts
+++ b/src/components/popover/widgets/icon.component.ts
@@ -13,6 +13,7 @@ import { NgSwitch, NgSwitchWhen } from '@angular/common';
             <i *ngSwitchWhen="'clock'" class="fa fa-clock-o"></i>
             <i *ngSwitchWhen="'trash'" class="glyphicon glyphicon-trash action--trash"></i>
             <i *ngSwitchWhen="'pencil'" class="glyphicon glyphicon-pencil action--edit"></i>
+            <i *ngSwitchWhen="'question-circle'" class ="fa fa-question-circle"></i>
         </div>
     `,
     directives: [NgSwitch, NgSwitchWhen],