diff --git a/src/common/base-store.ts b/src/common/base-store.ts
index d212c88a7e..04862f9146 100644
--- a/src/common/base-store.ts
+++ b/src/common/base-store.ts
@@ -61,7 +61,7 @@ export class BaseStore<T = any> extends Singleton {
       },
     });
     const storedModel = Object.assign({}, this.storeConfig.store);
-    Reflect.deleteProperty(storedModel, "__internal__"); // fixme: avoid "external-internals"
+    Reflect.deleteProperty(storedModel, "__internal__"); // todo: avoid "external-internals"
     logger.info(`[STORE]: LOADED from ${this.storeConfig.path}`);
     this.fromStore(storedModel);
     this.isLoaded = true;
@@ -69,8 +69,7 @@ export class BaseStore<T = any> extends Singleton {
 
   protected async save(model: T) {
     logger.info(`[STORE]: SAVING ${this.name}`);
-    // todo: avoid multiple file updates
-    // fixme: https://github.com/sindresorhus/conf/issues/114
+    // todo: update when fixed https://github.com/sindresorhus/conf/issues/114
     Object.entries(model).forEach(([key, value]) => {
       this.storeConfig.set(key, value);
     });
diff --git a/src/common/ipc.ts b/src/common/ipc.ts
index e5e8101994..bdcce8eee3 100644
--- a/src/common/ipc.ts
+++ b/src/common/ipc.ts
@@ -19,7 +19,7 @@ export interface IpcMessageOpts<A extends any[] = any> {
   channel: IpcChannel
   webContentId?: number; // sends to single webContents view
   filter?: (webContent: WebContents) => boolean
-  timeout?: number; // fixme: add support
+  timeout?: number; // todo: add support
   args?: A;
 }
 
diff --git a/src/renderer/api/endpoints/selfsubjectrulesreviews.api.ts b/src/renderer/api/endpoints/selfsubjectrulesreviews.api.ts
index 755dcfa54b..e03ba0b6ae 100644
--- a/src/renderer/api/endpoints/selfsubjectrulesreviews.api.ts
+++ b/src/renderer/api/endpoints/selfsubjectrulesreviews.api.ts
@@ -24,7 +24,7 @@ export class SelfSubjectRulesReview extends KubeObject {
   static kind = "SelfSubjectRulesReview"
 
   spec: {
-    // fixme: add more types from api docs
+    // todo: add more types from api docs
     namespace?: string;
   }
 
diff --git a/src/renderer/api/workload-kube-object.ts b/src/renderer/api/workload-kube-object.ts
index a32ccd99e9..c18b8df6c4 100644
--- a/src/renderer/api/workload-kube-object.ts
+++ b/src/renderer/api/workload-kube-object.ts
@@ -1,5 +1,5 @@
 import get from "lodash/get";
-import { IKubeObjectMetadata, KubeObject } from "./kube-object";
+import { KubeObject } from "./kube-object";
 
 interface IToleration {
   key?: string;
@@ -47,9 +47,7 @@ export interface IAffinity {
 }
 
 export class WorkloadKubeObject extends KubeObject {
-
-  // fixme: add type
-  spec: any;
+  spec: any; // todo: add proper types
 
   getSelectors(): string[] {
     const selector = this.spec.selector;
diff --git a/src/renderer/components/+custom-resources/crd-list.tsx b/src/renderer/components/+custom-resources/crd-list.tsx
index 5707f27c9d..bf8b89101a 100644
--- a/src/renderer/components/+custom-resources/crd-list.tsx
+++ b/src/renderer/components/+custom-resources/crd-list.tsx
@@ -63,7 +63,7 @@ export class CrdList extends React.Component {
           if (selectedGroups.length == 1) placeholder = <><Trans>Group</Trans>: {selectedGroups[0]}</>
           if (selectedGroups.length >= 2) placeholder = <><Trans>Groups</Trans>: {selectedGroups.join(", ")}</>
           return {
-            // fixme: move to global filters
+            // todo: move to global filters
             filters: (
               <Select
                 className="group-select"
diff --git a/src/renderer/components/+custom-resources/crd-resource-details.tsx b/src/renderer/components/+custom-resources/crd-resource-details.tsx
index 36874c3b7c..15353c923f 100644
--- a/src/renderer/components/+custom-resources/crd-resource-details.tsx
+++ b/src/renderer/components/+custom-resources/crd-resource-details.tsx
@@ -11,11 +11,9 @@ import { DrawerItem } from "../drawer";
 import { KubeObjectDetailsProps } from "../kube-object";
 import { apiManager } from "../../api/api-manager";
 import { crdStore } from "./crd.store";
-import { KubeObject } from "../../api/kube-object";
 import { KubeObjectMeta } from "../kube-object/kube-object-meta";
 
-// fixme: provide type-safe check for status
-interface Props extends KubeObjectDetailsProps<KubeObject & { status: any }> {
+interface Props extends KubeObjectDetailsProps {
 }
 
 @observer
diff --git a/src/renderer/components/dialog/dialog.tsx b/src/renderer/components/dialog/dialog.tsx
index d816a5aa9c..071c6aa811 100644
--- a/src/renderer/components/dialog/dialog.tsx
+++ b/src/renderer/components/dialog/dialog.tsx
@@ -8,6 +8,8 @@ import { Animate } from "../animate";
 import { cssNames, noop, stopPropagation } from "../../utils";
 import { navigation } from "../../navigation";
 
+// todo: refactor + handle animation-end in props.onClose()?
+
 export interface DialogProps {
   className?: string;
   isOpen?: boolean;
@@ -24,7 +26,6 @@ interface DialogState {
   isOpen: boolean;
 }
 
-// fixme: handle animation end props.onClose() (await props.close()?)
 @observer
 export class Dialog extends React.PureComponent<DialogProps, DialogState> {
   private contentElem: HTMLElement;
diff --git a/src/renderer/components/tooltip/tooltip.tsx b/src/renderer/components/tooltip/tooltip.tsx
index 6f57d725cc..a104618244 100644
--- a/src/renderer/components/tooltip/tooltip.tsx
+++ b/src/renderer/components/tooltip/tooltip.tsx
@@ -8,7 +8,7 @@ import { autobind, cssNames } from "../../utils";
 import { Animate } from "../animate";
 
 // todo: refactor -- better positioning + remove "flying effect"
-// fixme: always render outside of parent element ("overflow: auto" should not affect tooltip)
+// todo: always render outside of parent element ("overflow: auto" should not affect tooltip)
 
 export interface TooltipProps {
   htmlFor: string;