diff --git a/client/src/legacy/grid/grid-view.js b/client/src/legacy/grid/grid-view.js
index 94b504e5ef9..3e6ee537f62 100644
--- a/client/src/legacy/grid/grid-view.js
+++ b/client/src/legacy/grid/grid-view.js
@@ -10,7 +10,7 @@ jQuery.ajaxSettings.traditional = true;
 import Utils from "utils/utils";
 import GridModel from "legacy/grid/grid-model";
 import Templates from "legacy/grid/grid-template";
-import PopupMenu from "mvc/ui/popup-menu";
+import PopupMenu from "./popup-menu";
 import { init_refresh_on_change } from "onload/globalInits/init_refresh_on_change";
 
 var $ = jQuery;
diff --git a/client/src/mvc/ui/popup-menu.js b/client/src/legacy/grid/popup-menu.js
similarity index 100%
rename from client/src/mvc/ui/popup-menu.js
rename to client/src/legacy/grid/popup-menu.js
diff --git a/client/src/mvc/ui/icon-button.js b/client/src/viz/icon-button.js
similarity index 100%
rename from client/src/mvc/ui/icon-button.js
rename to client/src/viz/icon-button.js
diff --git a/client/src/viz/trackster.js b/client/src/viz/trackster.js
index 9b6fe3bbe86..617ca7514a7 100644
--- a/client/src/viz/trackster.js
+++ b/client/src/viz/trackster.js
@@ -16,7 +16,7 @@ import "ui/editable-text";
 import { getGalaxyInstance } from "app";
 import Backbone from "backbone";
 import $ from "jquery";
-import IconButton from "mvc/ui/icon-button";
+import IconButton from "./icon-button";
 import { getAppRoot } from "onload/loadConfig";
 import _ from "underscore";
 import _l from "utils/localization";