diff --git a/src/app/components/HardpointSlot.jsx b/src/app/components/HardpointSlot.jsx
deleted file mode 100644
index c077bec1..00000000
--- a/src/app/components/HardpointSlot.jsx
+++ /dev/null
@@ -1,147 +0,0 @@
-import React from 'react';
-import cn from 'classnames';
-import Slot from './Slot';
-import Persist from '../stores/Persist';
-import {
-  DamageAbsolute,
-  DamageKinetic,
-  DamageThermal,
-  DamageExplosive,
-  MountFixed,
-  MountGimballed,
-  MountTurret,
-  ListModifications,
-  Modified
-} from './SvgIcons';
-import { Modifications } from 'coriolis-data/dist';
-import { stopCtxPropagation } from '../utils/UtilityFunctions';
-import { blueprintTooltip } from '../utils/BlueprintFunctions';
-
-/**
- * Hardpoint / Utility Slot
- */
-export default class HardpointSlot extends Slot {
-  /**
-   * Get the CSS class name for the slot.
-   * @return {string} CSS Class name
-   */
-  _getClassNames() {
-    return this.props.maxClass > 0 ? 'hardpoint' : null;
-  }
-
-  /**
-   * Get the label for the slot
-   * @param  {Function} translate   Translate function
-   * @return {string}               Label
-   */
-  _getMaxClassLabel(translate) {
-    return translate(['U', 'S', 'M', 'L', 'H'][this.props.maxClass]);
-  }
-
-  /**
-   * Generate the slot contents
-   * @param  {Object} m             Mounted Module
-   * @param  {Function} translate   Translate function
-   * @param  {Object} formats       Localized Formats map
-   * @param  {Object} u             Localized Units Map
-   * @return {React.Component}      Slot contents
-   */
-  _getSlotDetails(m, translate, formats, u) {
-    if (m) {
-      let classRating = `${m.class}${m.rating}${m.missile ? '/' + m.missile : ''}`;
-      let { drag, drop } = this.props;
-      let { termtip, tooltip } = this.context;
-      let showModuleResistances = Persist.showModuleResistances();
-
-      // Modifications tooltip shows blueprint and grade, if available
-      let modTT = translate('modified');
-      if (m && m.blueprint && m.blueprint.name) {
-        // modTT = translate(m.blueprint.name) + ' ' + translate('grade') + ' ' + m.blueprint.grade;
-        // if (m.blueprint.special && m.blueprint.special.id >= 0) {
-        //   modTT += ', ' + translate(m.blueprint.special.name);
-        // }
-        // modTT = (
-        //   <div>
-        //     <div>{modTT}</div>
-        //     {blueprintTooltip(translate, m.blueprint.grades[m.blueprint.grade], m)}
-        //   </div>
-        // );
-      }
-
-      const className = cn('details', m.isEnabled() ? '' : 'disabled');
-      return <div className={className} draggable='true' onDragStart={drag} onDragEnd={drop}>
-        <div className={'cb'}>
-          <div className={'l'}>
-            {/* {m.mount && m.mount == 'F' ? <span onMouseOver={termtip.bind(null, 'fixed')}
-                                               onMouseOut={tooltip.bind(null, null)}><MountFixed/></span> : ''}
-            {m.mount && m.mount == 'G' ? <span onMouseOver={termtip.bind(null, 'gimballed')}
-                                               onMouseOut={tooltip.bind(null, null)}><MountGimballed/></span> : ''}
-            {m.mount && m.mount == 'T' ? <span onMouseOver={termtip.bind(null, 'turreted')}
-                                               onMouseOut={tooltip.bind(null, null)}><MountTurret/></span> : ''}
-            {m.getDamageDist() && m.getDamageDist().K ? <span onMouseOver={termtip.bind(null, 'kinetic')}
-                                                              onMouseOut={tooltip.bind(null, null)}><DamageKinetic/></span> : ''}
-            {m.getDamageDist() && m.getDamageDist().T ? <span onMouseOver={termtip.bind(null, 'thermal')}
-                                                              onMouseOut={tooltip.bind(null, null)}><DamageThermal/></span> : ''}
-            {m.getDamageDist() && m.getDamageDist().E ? <span onMouseOver={termtip.bind(null, 'explosive')}
-                                                              onMouseOut={tooltip.bind(null, null)}><DamageExplosive/></span> : ''}
-            {m.getDamageDist() && m.getDamageDist().A ? <span onMouseOver={termtip.bind(null, 'absolute')}
-                                                              onMouseOut={tooltip.bind(null, null)}><DamageAbsolute/></span> : ''}
-            {classRating} {translate(m.name || m.grp)}{m.mods && Object.keys(m.mods).length > 0 ? <span className='r'
-                                                                                                        onMouseOver={termtip.bind(null, modTT)}
-                                                                                                        onMouseOut={tooltip.bind(null, null)}><Modified/></span> : null} */}
-          </div>
-
-          <div className={'r'}>{formats.round(m.get('mass'))}{u.T}</div>
-        </div>
-        <div className={'cb'}>
-          {/* {m.getDps() ? <div className={'l'} onMouseOver={termtip.bind(null, m.getClip() ? 'dpssdps' : 'dps')}
-                             onMouseOut={tooltip.bind(null, null)}>{translate('DPS')}: {formats.round1(m.getDps())} {m.getClip() ?
-            <span>({formats.round1(m.getSDps())})</span> : null}</div> : null}
-          {m.getDamage() ? <div className={'l'} onMouseOver={termtip.bind(null, m.getDamage() ? 'shotdmg' : 'shotdmg')}
-                                onMouseOut={tooltip.bind(null, null)}>{translate('shotdmg')}: {formats.round1(m.getDamage())}</div> : null}
-          {m.getEps() ? <div className={'l'} onMouseOver={termtip.bind(null, m.getClip() ? 'epsseps' : 'eps')}
-                             onMouseOut={tooltip.bind(null, null)}>{translate('EPS')}: {formats.round1(m.getEps())}{u.MW} {m.getClip() ?
-            <span>({formats.round1(m.getEps() * m.getSustainedFactor())}{u.MW})</span> : null}</div> : null}
-          {m.getHps() ? <div className={'l'} onMouseOver={termtip.bind(null, m.getClip() ? 'hpsshps' : 'hps')}
-                             onMouseOut={tooltip.bind(null, null)}>{translate('HPS')}: {formats.round1(m.getHps())} {m.getClip() ?
-            <span>({formats.round1(m.getHps() * m.getSustainedFactor())})</span> : null}</div> : null}
-          {m.getDps() && m.getEps() ? <div className={'l'} onMouseOver={termtip.bind(null, 'dpe')}
-                                           onMouseOut={tooltip.bind(null, null)}>{translate('DPE')}: {formats.f1(m.getDps() / m.getEps())}</div> : null}
-          {m.getRoF() ? <div className={'l'} onMouseOver={termtip.bind(null, 'rof')}
-                             onMouseOut={tooltip.bind(null, null)}>{translate('ROF')}: {formats.f1(m.getRoF())}{u.ps}</div> : null}
-          {m.getRange() ? <div
-            className={'l'}>{translate('range', m.grp)} {formats.f1(m.getRange() / 1000)}{u.km}</div> : null}
-          {m.getScanTime() ? <div
-            className={'l'}>{translate('scantime')} {formats.f1(m.getScanTime())}{u.s}</div> : null}
-          {m.getFalloff() ? <div
-            className={'l'}>{translate('falloff')} {formats.round(m.getFalloff() / 1000)}{u.km}</div> : null}
-          {m.getShieldBoost() ? <div className={'l'}>+{formats.pct1(m.getShieldBoost())}</div> : null}
-          {m.getAmmo() ? <div
-            className={'l'}>{translate('ammunition')}: {formats.int(m.getClip())}/{formats.int(m.getAmmo())}</div> : null}
-          {m.getReload() ? <div className={'l'}>{translate('wep_reload')}: {formats.round(m.getReload())}{u.s}</div> : null}
-          {m.getShotSpeed() ? <div
-            className={'l'}>{translate('shotspeed')}: {formats.int(m.getShotSpeed())}{u.mps}</div> : null}
-          {m.getPiercing() ? <div className={'l'}>{translate('piercing')}: {formats.int(m.getPiercing())}</div> : null}
-          {m.getJitter() ? <div className={'l'}>{translate('jitter')}: {formats.f2(m.getJitter())}°</div> : null}
-          {m.getScanAngle() ? <div className={'l'}>{translate('scan angle')}: {formats.f2(m.getScanAngle())}°</div> : null}
-          {m.getScanRange() ? <div className={'l'}>{translate('scan range')}: {formats.int(m.getScanRange())}{u.m}</div> : null}
-          {m.getMaxAngle() ? <div className={'l'}>{translate('max angle')}: {formats.f2(m.getMaxAngle())}°</div> : null}
-          {showModuleResistances && m.getExplosiveResistance() ? <div
-            className='l'>{translate('explres')}: {formats.pct(m.getExplosiveResistance())}</div> : null}
-          {showModuleResistances && m.getKineticResistance() ? <div
-            className='l'>{translate('kinres')}: {formats.pct(m.getKineticResistance())}</div> : null}
-          {showModuleResistances && m.getThermalResistance() ? <div
-            className='l'>{translate('thermres')}: {formats.pct(m.getThermalResistance())}</div> : null}
-          {m.getIntegrity() ? <div className='l'>{translate('integrity')}: {formats.int(m.getIntegrity())}</div> : null}
-          {m && validMods.length > 0 ? <div className='r' tabIndex="0" ref={modButton => this.modButton = modButton}>
-            <button tabIndex="-1" onClick={this._toggleModifications.bind(this)} onContextMenu={stopCtxPropagation}
-                    onMouseOver={termtip.bind(null, 'modifications')} onMouseOut={tooltip.bind(null, null)}>
-              <ListModifications/></button>
-          </div> : null} */}
-        </div>
-      </div>;
-    } else {
-      return <div className={'empty'}>{translate('empty')}</div>;
-    }
-  }
-}
diff --git a/src/app/components/HardpointSlotSection.jsx b/src/app/components/HardpointSlotSection.jsx
index 18b48e39..5f152f5d 100644
--- a/src/app/components/HardpointSlotSection.jsx
+++ b/src/app/components/HardpointSlotSection.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import SlotSection from './SlotSection';
-import HardpointSlot from './HardpointSlot';
+import InternalSlot from './InternalSlot';
 import { MountFixed, MountGimballed, MountTurret } from '../components/SvgIcons';
 import { stopCtxPropagation } from '../utils/UtilityFunctions';
 
@@ -70,7 +70,7 @@ export default class HardpointSlotSection extends SlotSection {
     let slots = [];
 
     for (let h of ship.getHardpoints(undefined, true)) {
-      slots.push(<HardpointSlot
+      slots.push(<InternalSlot
         key={h.object.Slot}
         maxClass={h.getSize()}
         onOpen={this._openMenu.bind(this, h)}
diff --git a/src/app/components/Slot.jsx b/src/app/components/Slot.jsx
index 62be06c9..e218231d 100644
--- a/src/app/components/Slot.jsx
+++ b/src/app/components/Slot.jsx
@@ -7,7 +7,14 @@ import ModificationsMenu from './ModificationsMenu';
 import { diffDetails } from '../utils/SlotFunctions';
 import { wrapCtxMenu } from '../utils/UtilityFunctions';
 import { Ship, Module } from 'ed-forge';
-import { REG_MILITARY_SLOT } from 'ed-forge/lib/data/slots';
+import { REG_MILITARY_SLOT, REG_HARDPOINT_SLOT } from 'ed-forge/lib/data/slots';
+
+const HARDPOINT_SLOT_LABELS = {
+  1: 'S',
+  2: 'M',
+  3: 'L',
+  4: 'H',
+};
 
 /**
  * Abstract Slot
@@ -58,7 +65,19 @@ export default class Slot extends TranslatedComponent {
    * @return {string} label
    */
   _getMaxClassLabel() {
-    return this.props.slot.getSize();
+    const { slot } = this.props;
+    let size = slot.getSize();
+    switch (true) {
+      case slot.getSlot() === 'armour':
+        return '';
+      case size === 0:
+        // This can also happen for armour but that case was handled above
+        return 'U';
+      case Boolean(slot.getSlot().match(REG_HARDPOINT_SLOT)):
+        return HARDPOINT_SLOT_LABELS[size];
+      default:
+        return size;
+    }
   }
 
   /**
diff --git a/src/app/components/UtilitySlotSection.jsx b/src/app/components/UtilitySlotSection.jsx
index 487af032..a65fc8e6 100644
--- a/src/app/components/UtilitySlotSection.jsx
+++ b/src/app/components/UtilitySlotSection.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import SlotSection from './SlotSection';
-import HardpointSlot from './HardpointSlot';
+import InternalSlot from './InternalSlot';
 import { stopCtxPropagation } from '../utils/UtilityFunctions';
 
 /**
@@ -70,7 +70,7 @@ export default class UtilitySlotSection extends SlotSection {
     let { originSlot, targetSlot } = this.state;
 
     for (let h of ship.getUtilities(undefined, true)) {
-      slots.push(<HardpointSlot
+      slots.push(<InternalSlot
         key={h.object.Slot}
         maxClass={h.getSize()}
         onOpen={this._openMenu.bind(this,h)}