diff --git a/MacPass/MPToolbarButton.h b/MacPass/MPToolbarButton.h
index 6fea779d..6b664f6a 100644
--- a/MacPass/MPToolbarButton.h
+++ b/MacPass/MPToolbarButton.h
@@ -24,9 +24,4 @@
 
 @interface MPToolbarButton : NSButton
 
-/* This methods ensure, that the button get sized correctly if used as the view in a NSToolbarItem*/
-
-- (void)setControlSize:(NSControlSize)controlSize;
-- (NSControlSize)controlSize;
-
 @end
diff --git a/MacPass/MPToolbarButton.m b/MacPass/MPToolbarButton.m
index 678ab2b4..1785e41b 100644
--- a/MacPass/MPToolbarButton.m
+++ b/MacPass/MPToolbarButton.m
@@ -55,25 +55,7 @@
     default:
       break;
   }
-  if([self.superclass instancesRespondToSelector:@selector(setControlSize:)]) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunguarded-availability"
-    super.controlSize = controlSize;
-#pragma clang diagnostic pop
-  }
-  else {
-    self.cell.controlSize = controlSize;
-  }
-}
-
-- (NSControlSize)controlSize {
-  if([self.superclass instancesRespondToSelector:@selector(controlSize)]) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunguarded-availability"
-    return super.controlSize;
-#pragma clang pop
-  }
-  return self.cell.controlSize;
+  super.controlSize = controlSize;
 }
 
 @end