diff --git a/src/daemon/keymap_patch.c b/src/daemon/keymap_patch.c
index 428e779a..fe2ebc94 100644
--- a/src/daemon/keymap_patch.c
+++ b/src/daemon/keymap_patch.c
@@ -86,11 +86,11 @@ keypatch k100patch[] = {
 };
 
 keypatch k70tklpatch[] = {
-    { 1, "logo",    1, KEY_CORSAIR },
     { 114, "lock",    114, KEY_CORSAIR },
-    { 128, "profswitch",    128, KEY_CORSAIR },
+    {   1, "logo",      1, KEY_NONE },
 };
 
+
 #define ADD_PATCH(vendor, product, patch) \
     { (vendor), (product), (patch), sizeof(patch)/sizeof(*patch) }
 
diff --git a/src/gui/kbperf.cpp b/src/gui/kbperf.cpp
index 9aa5434c..e50f891c 100644
--- a/src/gui/kbperf.cpp
+++ b/src/gui/kbperf.cpp
@@ -513,8 +513,7 @@ void KbPerf::applyIndicators(int modeIndex, const bool indicatorState[HW_I_COUNT
     // Disable the M indicators for the K70MK2, the STRAFE_MK2, and the K70_TKL.
     // FIXME: Only enable them for devices that need them instead
     if(iEnable[MODE] && !(this->modeParent()->bind()->map().model() == KeyMap::K70MK2 ||
-                          this->modeParent()->bind()->map().model() == KeyMap::STRAFE_MK2 ||
-                          this->modeParent()->bind()->map().model() == KeyMap::K70_TKL)){
+                          this->modeParent()->bind()->map().model() == KeyMap::STRAFE_MK2)){
         for(uchar i = 0; i < Kb::HWMODE_MAX; i++){
             char name[4];
             snprintf(name, sizeof(name), "m%d", i + 1);
diff --git a/src/gui/keymap.cpp b/src/gui/keymap.cpp
index 653cab2e..7f6d4504 100644
--- a/src/gui/keymap.cpp
+++ b/src/gui/keymap.cpp
@@ -870,26 +870,20 @@ static QHash<QString, Key> getMap(KeyMap::Model model, KeyMap::Layout layout){
         break;
     }
     case KeyMap::K70_TKL:{
-        map = getMap(KeyMap::K70, layout);
-        // Very similar to the K63 but with slightly different media button positions
-        QMutableHashIterator<QString, Key> i(map);
-        while(i.hasNext()){
-            i.next();
-            if(i.value().x >= K65_WIDTH)
-                i.remove();
-        }
+        // Same width as the K63 but with a top row more like the K70
+        map = getMap(KeyMap::K63, layout);
         for(const Key* key = K70TklTopRow; key < K70TklTopRow + K70_TKL_TOP_COUNT; key++)
             map[key->name] = *key;
 
         map.remove("rwin");
+        map.remove("voldn");
+        map.remove("volup");
         map["fn"] = KStrafeKeys[3];
         map["fn"].x -= 12;
         map["light"].x = 190 - K70_X_START;
         map["light"].height = 8;
         map["lock"].x = 202 - K70_X_START;
         map["lock"].height = 8;
-
-        // Done!
         break;
     }
     case KeyMap::STRAFE_MK2:{