diff --git a/locale/POTFILES.in b/locale/POTFILES.in
index f822ebb5f..f182e077f 100644
--- a/locale/POTFILES.in
+++ b/locale/POTFILES.in
@@ -694,8 +694,12 @@ src/tracks/ui/BackgroundCell.cpp
 src/tracks/ui/BackgroundCell.h
 src/tracks/ui/ButtonHandle.cpp
 src/tracks/ui/ButtonHandle.h
+src/tracks/ui/CommonTrackControls.cpp
+src/tracks/ui/CommonTrackControls.h
 src/tracks/ui/CommonTrackPanelCell.cpp
 src/tracks/ui/CommonTrackPanelCell.h
+src/tracks/ui/CommonTrackView.cpp
+src/tracks/ui/CommonTrackView.h
 src/tracks/ui/EditCursorOverlay.cpp
 src/tracks/ui/EditCursorOverlay.h
 src/tracks/ui/EnvelopeHandle.cpp
diff --git a/mac/Audacity.xcodeproj/project.pbxproj b/mac/Audacity.xcodeproj/project.pbxproj
index 03c676bdd..57eaf8a71 100644
--- a/mac/Audacity.xcodeproj/project.pbxproj
+++ b/mac/Audacity.xcodeproj/project.pbxproj
@@ -1288,6 +1288,8 @@
 		5EB15A2022A94043009FEC89 /* ProjectHistory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EB15A1E22A94043009FEC89 /* ProjectHistory.cpp */; };
 		5EBD243D1F74C50800132E0A /* eu_ES.po in Sources */ = {isa = PBXBuildFile; fileRef = 5EBD243C1F74C50800132E0A /* eu_ES.po */; };
 		5EBD35861F78D37A0084D13F /* pt_PT.po in Sources */ = {isa = PBXBuildFile; fileRef = 5EBD35851F78D37A0084D13F /* pt_PT.po */; };
+		5EC4257222B92383005E8AB5 /* CommonTrackControls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EC4256E22B92383005E8AB5 /* CommonTrackControls.cpp */; };
+		5EC4257322B92383005E8AB5 /* CommonTrackView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EC4257022B92383005E8AB5 /* CommonTrackView.cpp */; };
 		5EC7ED061E101C5C0052CAE2 /* NotYetAvailableException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EC7ED041E101C5C0052CAE2 /* NotYetAvailableException.cpp */; };
 		5ECF728722871A4F007F2A35 /* ShuttleGetDefinition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5ECF728522871A4F007F2A35 /* ShuttleGetDefinition.cpp */; };
 		5ECF728A22887B3B007F2A35 /* MissingAliasFileDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5ECF728822887B3B007F2A35 /* MissingAliasFileDialog.cpp */; };
@@ -3333,6 +3335,10 @@
 		5EB9EA281D5B81270050AF40 /* ImportForwards.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImportForwards.h; sourceTree = "<group>"; };
 		5EBD243C1F74C50800132E0A /* eu_ES.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = eu_ES.po; path = ../locale/eu_ES.po; sourceTree = "<group>"; };
 		5EBD35851F78D37A0084D13F /* pt_PT.po */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = pt_PT.po; path = ../locale/pt_PT.po; sourceTree = "<group>"; };
+		5EC4256E22B92383005E8AB5 /* CommonTrackControls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CommonTrackControls.cpp; sourceTree = "<group>"; };
+		5EC4256F22B92383005E8AB5 /* CommonTrackControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommonTrackControls.h; sourceTree = "<group>"; };
+		5EC4257022B92383005E8AB5 /* CommonTrackView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CommonTrackView.cpp; sourceTree = "<group>"; };
+		5EC4257122B92383005E8AB5 /* CommonTrackView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommonTrackView.h; sourceTree = "<group>"; };
 		5EC7ED041E101C5C0052CAE2 /* NotYetAvailableException.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NotYetAvailableException.cpp; sourceTree = "<group>"; };
 		5EC7ED051E101C5C0052CAE2 /* NotYetAvailableException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotYetAvailableException.h; sourceTree = "<group>"; };
 		5ECCE7651DE49834009900E9 /* AudacityException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudacityException.h; sourceTree = "<group>"; };
@@ -6256,7 +6262,9 @@
 			children = (
 				5E73965A1DAFDAA400BA0A4D /* BackgroundCell.cpp */,
 				5E73964B1DAFD95B00BA0A4D /* ButtonHandle.cpp */,
+				5EC4256E22B92383005E8AB5 /* CommonTrackControls.cpp */,
 				5E1512661DB0010C00702E29 /* CommonTrackPanelCell.cpp */,
+				5EC4257022B92383005E8AB5 /* CommonTrackView.cpp */,
 				5E74D2DD1CC4429700D88B0B /* EditCursorOverlay.cpp */,
 				5E7396451DAFD8F200BA0A4D /* EnvelopeHandle.cpp */,
 				5E74D2DF1CC4429700D88B0B /* PlayIndicatorOverlay.cpp */,
@@ -6272,7 +6280,9 @@
 				5E73963C1DAFD86000BA0A4D /* ZoomHandle.cpp */,
 				5E73965B1DAFDAA400BA0A4D /* BackgroundCell.h */,
 				5E73964C1DAFD95B00BA0A4D /* ButtonHandle.h */,
+				5EC4256F22B92383005E8AB5 /* CommonTrackControls.h */,
 				5E1512671DB0010C00702E29 /* CommonTrackPanelCell.h */,
+				5EC4257122B92383005E8AB5 /* CommonTrackView.h */,
 				5E74D2DE1CC4429700D88B0B /* EditCursorOverlay.h */,
 				5E7396461DAFD8F200BA0A4D /* EnvelopeHandle.h */,
 				5E74D2E01CC4429700D88B0B /* PlayIndicatorOverlay.h */,
@@ -8327,6 +8337,7 @@
 				5ED1D0B11CDE560C00471E3C /* BackedPanel.cpp in Sources */,
 				1790B11F09883BFD008A330A /* BatchProcessDialog.cpp in Sources */,
 				5E0A1CDD20E95FF7001AAF8D /* CellularPanel.cpp in Sources */,
+				5EC4257222B92383005E8AB5 /* CommonTrackControls.cpp in Sources */,
 				1790B12009883BFD008A330A /* Benchmark.cpp in Sources */,
 				1790B12109883BFD008A330A /* LegacyAliasBlockFile.cpp in Sources */,
 				1790B12209883BFD008A330A /* LegacyBlockFile.cpp in Sources */,
@@ -8608,6 +8619,7 @@
 				289E750A1006D0BD00CEF79B /* MixerBoard.cpp in Sources */,
 				28BD8AB1101DF4C700686679 /* BatchEvalCommand.cpp in Sources */,
 				28BD8AB2101DF4C700686679 /* CommandDirectory.cpp in Sources */,
+				5EC4257322B92383005E8AB5 /* CommonTrackView.cpp in Sources */,
 				5E10D9061EC8F81300B3AC57 /* PlayableTrackButtonHandles.cpp in Sources */,
 				28948427101DF8FC005B0713 /* EffectsPrefs.cpp in Sources */,
 				287E207F102561F300BF47A2 /* PluginManager.cpp in Sources */,
diff --git a/src/Makefile.in b/src/Makefile.in
index 2c22be152..3c1cec64b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -542,11 +542,13 @@ am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \
 	tracks/timetrack/ui/TimeTrackVRulerControls.h \
 	tracks/ui/BackgroundCell.cpp tracks/ui/BackgroundCell.h \
 	tracks/ui/ButtonHandle.h tracks/ui/ButtonHandle.cpp \
+	tracks/ui/CommonTrackControls.cpp \
+	tracks/ui/CommonTrackControls.h \
 	tracks/ui/CommonTrackPanelCell.cpp \
-	tracks/ui/CommonTrackPanelCell.h \
-	tracks/ui/EditCursorOverlay.cpp tracks/ui/EditCursorOverlay.h \
-	tracks/ui/EnvelopeHandle.cpp tracks/ui/EnvelopeHandle.h \
-	tracks/ui/PlayIndicatorOverlay.cpp \
+	tracks/ui/CommonTrackPanelCell.h tracks/ui/CommonTrackView.cpp \
+	tracks/ui/CommonTrackView.h tracks/ui/EditCursorOverlay.cpp \
+	tracks/ui/EditCursorOverlay.h tracks/ui/EnvelopeHandle.cpp \
+	tracks/ui/EnvelopeHandle.h tracks/ui/PlayIndicatorOverlay.cpp \
 	tracks/ui/PlayIndicatorOverlay.h tracks/ui/Scrubbing.cpp \
 	tracks/ui/Scrubbing.h tracks/ui/SelectHandle.cpp \
 	tracks/ui/SelectHandle.h tracks/ui/SliderHandle.cpp \
@@ -888,7 +890,9 @@ am_audacity_OBJECTS = $(am__objects_1) audacity-AboutDialog.$(OBJEXT) \
 	tracks/timetrack/ui/audacity-TimeTrackVRulerControls.$(OBJEXT) \
 	tracks/ui/audacity-BackgroundCell.$(OBJEXT) \
 	tracks/ui/audacity-ButtonHandle.$(OBJEXT) \
+	tracks/ui/audacity-CommonTrackControls.$(OBJEXT) \
 	tracks/ui/audacity-CommonTrackPanelCell.$(OBJEXT) \
+	tracks/ui/audacity-CommonTrackView.$(OBJEXT) \
 	tracks/ui/audacity-EditCursorOverlay.$(OBJEXT) \
 	tracks/ui/audacity-EnvelopeHandle.$(OBJEXT) \
 	tracks/ui/audacity-PlayIndicatorOverlay.$(OBJEXT) \
@@ -1628,11 +1632,13 @@ audacity_SOURCES = $(libaudacity_la_SOURCES) AboutDialog.cpp \
 	tracks/timetrack/ui/TimeTrackVRulerControls.h \
 	tracks/ui/BackgroundCell.cpp tracks/ui/BackgroundCell.h \
 	tracks/ui/ButtonHandle.h tracks/ui/ButtonHandle.cpp \
+	tracks/ui/CommonTrackControls.cpp \
+	tracks/ui/CommonTrackControls.h \
 	tracks/ui/CommonTrackPanelCell.cpp \
-	tracks/ui/CommonTrackPanelCell.h \
-	tracks/ui/EditCursorOverlay.cpp tracks/ui/EditCursorOverlay.h \
-	tracks/ui/EnvelopeHandle.cpp tracks/ui/EnvelopeHandle.h \
-	tracks/ui/PlayIndicatorOverlay.cpp \
+	tracks/ui/CommonTrackPanelCell.h tracks/ui/CommonTrackView.cpp \
+	tracks/ui/CommonTrackView.h tracks/ui/EditCursorOverlay.cpp \
+	tracks/ui/EditCursorOverlay.h tracks/ui/EnvelopeHandle.cpp \
+	tracks/ui/EnvelopeHandle.h tracks/ui/PlayIndicatorOverlay.cpp \
 	tracks/ui/PlayIndicatorOverlay.h tracks/ui/Scrubbing.cpp \
 	tracks/ui/Scrubbing.h tracks/ui/SelectHandle.cpp \
 	tracks/ui/SelectHandle.h tracks/ui/SliderHandle.cpp \
@@ -2326,8 +2332,12 @@ tracks/ui/audacity-BackgroundCell.$(OBJEXT):  \
 	tracks/ui/$(am__dirstamp) tracks/ui/$(DEPDIR)/$(am__dirstamp)
 tracks/ui/audacity-ButtonHandle.$(OBJEXT): tracks/ui/$(am__dirstamp) \
 	tracks/ui/$(DEPDIR)/$(am__dirstamp)
+tracks/ui/audacity-CommonTrackControls.$(OBJEXT):  \
+	tracks/ui/$(am__dirstamp) tracks/ui/$(DEPDIR)/$(am__dirstamp)
 tracks/ui/audacity-CommonTrackPanelCell.$(OBJEXT):  \
 	tracks/ui/$(am__dirstamp) tracks/ui/$(DEPDIR)/$(am__dirstamp)
+tracks/ui/audacity-CommonTrackView.$(OBJEXT):  \
+	tracks/ui/$(am__dirstamp) tracks/ui/$(DEPDIR)/$(am__dirstamp)
 tracks/ui/audacity-EditCursorOverlay.$(OBJEXT):  \
 	tracks/ui/$(am__dirstamp) tracks/ui/$(DEPDIR)/$(am__dirstamp)
 tracks/ui/audacity-EnvelopeHandle.$(OBJEXT):  \
@@ -2866,7 +2876,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@tracks/timetrack/ui/$(DEPDIR)/audacity-TimeTrackView.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tracks/ui/$(DEPDIR)/audacity-BackgroundCell.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tracks/ui/$(DEPDIR)/audacity-ButtonHandle.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tracks/ui/$(DEPDIR)/audacity-CommonTrackControls.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tracks/ui/$(DEPDIR)/audacity-CommonTrackPanelCell.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tracks/ui/$(DEPDIR)/audacity-CommonTrackView.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tracks/ui/$(DEPDIR)/audacity-EditCursorOverlay.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tracks/ui/$(DEPDIR)/audacity-EnvelopeHandle.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tracks/ui/$(DEPDIR)/audacity-PlayIndicatorOverlay.Po@am__quote@
@@ -7256,6 +7268,20 @@ tracks/ui/audacity-ButtonHandle.obj: tracks/ui/ButtonHandle.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o tracks/ui/audacity-ButtonHandle.obj `if test -f 'tracks/ui/ButtonHandle.cpp'; then $(CYGPATH_W) 'tracks/ui/ButtonHandle.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/ui/ButtonHandle.cpp'; fi`
 
+tracks/ui/audacity-CommonTrackControls.o: tracks/ui/CommonTrackControls.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/ui/audacity-CommonTrackControls.o -MD -MP -MF tracks/ui/$(DEPDIR)/audacity-CommonTrackControls.Tpo -c -o tracks/ui/audacity-CommonTrackControls.o `test -f 'tracks/ui/CommonTrackControls.cpp' || echo '$(srcdir)/'`tracks/ui/CommonTrackControls.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) tracks/ui/$(DEPDIR)/audacity-CommonTrackControls.Tpo tracks/ui/$(DEPDIR)/audacity-CommonTrackControls.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='tracks/ui/CommonTrackControls.cpp' object='tracks/ui/audacity-CommonTrackControls.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o tracks/ui/audacity-CommonTrackControls.o `test -f 'tracks/ui/CommonTrackControls.cpp' || echo '$(srcdir)/'`tracks/ui/CommonTrackControls.cpp
+
+tracks/ui/audacity-CommonTrackControls.obj: tracks/ui/CommonTrackControls.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/ui/audacity-CommonTrackControls.obj -MD -MP -MF tracks/ui/$(DEPDIR)/audacity-CommonTrackControls.Tpo -c -o tracks/ui/audacity-CommonTrackControls.obj `if test -f 'tracks/ui/CommonTrackControls.cpp'; then $(CYGPATH_W) 'tracks/ui/CommonTrackControls.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/ui/CommonTrackControls.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) tracks/ui/$(DEPDIR)/audacity-CommonTrackControls.Tpo tracks/ui/$(DEPDIR)/audacity-CommonTrackControls.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='tracks/ui/CommonTrackControls.cpp' object='tracks/ui/audacity-CommonTrackControls.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o tracks/ui/audacity-CommonTrackControls.obj `if test -f 'tracks/ui/CommonTrackControls.cpp'; then $(CYGPATH_W) 'tracks/ui/CommonTrackControls.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/ui/CommonTrackControls.cpp'; fi`
+
 tracks/ui/audacity-CommonTrackPanelCell.o: tracks/ui/CommonTrackPanelCell.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/ui/audacity-CommonTrackPanelCell.o -MD -MP -MF tracks/ui/$(DEPDIR)/audacity-CommonTrackPanelCell.Tpo -c -o tracks/ui/audacity-CommonTrackPanelCell.o `test -f 'tracks/ui/CommonTrackPanelCell.cpp' || echo '$(srcdir)/'`tracks/ui/CommonTrackPanelCell.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) tracks/ui/$(DEPDIR)/audacity-CommonTrackPanelCell.Tpo tracks/ui/$(DEPDIR)/audacity-CommonTrackPanelCell.Po
@@ -7270,6 +7296,20 @@ tracks/ui/audacity-CommonTrackPanelCell.obj: tracks/ui/CommonTrackPanelCell.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o tracks/ui/audacity-CommonTrackPanelCell.obj `if test -f 'tracks/ui/CommonTrackPanelCell.cpp'; then $(CYGPATH_W) 'tracks/ui/CommonTrackPanelCell.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/ui/CommonTrackPanelCell.cpp'; fi`
 
+tracks/ui/audacity-CommonTrackView.o: tracks/ui/CommonTrackView.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/ui/audacity-CommonTrackView.o -MD -MP -MF tracks/ui/$(DEPDIR)/audacity-CommonTrackView.Tpo -c -o tracks/ui/audacity-CommonTrackView.o `test -f 'tracks/ui/CommonTrackView.cpp' || echo '$(srcdir)/'`tracks/ui/CommonTrackView.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) tracks/ui/$(DEPDIR)/audacity-CommonTrackView.Tpo tracks/ui/$(DEPDIR)/audacity-CommonTrackView.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='tracks/ui/CommonTrackView.cpp' object='tracks/ui/audacity-CommonTrackView.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o tracks/ui/audacity-CommonTrackView.o `test -f 'tracks/ui/CommonTrackView.cpp' || echo '$(srcdir)/'`tracks/ui/CommonTrackView.cpp
+
+tracks/ui/audacity-CommonTrackView.obj: tracks/ui/CommonTrackView.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/ui/audacity-CommonTrackView.obj -MD -MP -MF tracks/ui/$(DEPDIR)/audacity-CommonTrackView.Tpo -c -o tracks/ui/audacity-CommonTrackView.obj `if test -f 'tracks/ui/CommonTrackView.cpp'; then $(CYGPATH_W) 'tracks/ui/CommonTrackView.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/ui/CommonTrackView.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) tracks/ui/$(DEPDIR)/audacity-CommonTrackView.Tpo tracks/ui/$(DEPDIR)/audacity-CommonTrackView.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='tracks/ui/CommonTrackView.cpp' object='tracks/ui/audacity-CommonTrackView.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o tracks/ui/audacity-CommonTrackView.obj `if test -f 'tracks/ui/CommonTrackView.cpp'; then $(CYGPATH_W) 'tracks/ui/CommonTrackView.cpp'; else $(CYGPATH_W) '$(srcdir)/tracks/ui/CommonTrackView.cpp'; fi`
+
 tracks/ui/audacity-EditCursorOverlay.o: tracks/ui/EditCursorOverlay.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT tracks/ui/audacity-EditCursorOverlay.o -MD -MP -MF tracks/ui/$(DEPDIR)/audacity-EditCursorOverlay.Tpo -c -o tracks/ui/audacity-EditCursorOverlay.o `test -f 'tracks/ui/EditCursorOverlay.cpp' || echo '$(srcdir)/'`tracks/ui/EditCursorOverlay.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) tracks/ui/$(DEPDIR)/audacity-EditCursorOverlay.Tpo tracks/ui/$(DEPDIR)/audacity-EditCursorOverlay.Po
diff --git a/src/tracks/ui/CommonTrackControls.cpp b/src/tracks/ui/CommonTrackControls.cpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/tracks/ui/CommonTrackControls.h b/src/tracks/ui/CommonTrackControls.h
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/tracks/ui/CommonTrackView.cpp b/src/tracks/ui/CommonTrackView.cpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/tracks/ui/CommonTrackView.h b/src/tracks/ui/CommonTrackView.h
new file mode 100644
index 000000000..e69de29bb
diff --git a/win/Projects/Audacity/Audacity.vcxproj b/win/Projects/Audacity/Audacity.vcxproj
index bb77b5c1d..dd38419fd 100755
--- a/win/Projects/Audacity/Audacity.vcxproj
+++ b/win/Projects/Audacity/Audacity.vcxproj
@@ -298,7 +298,9 @@
     <ClCompile Include="..\..\..\src\tracks\timetrack\ui\TimeTrackVRulerControls.cpp" />
     <ClCompile Include="..\..\..\src\tracks\ui\BackgroundCell.cpp" />
     <ClCompile Include="..\..\..\src\tracks\ui\ButtonHandle.cpp" />
+    <ClCompile Include="..\..\..\src\tracks\ui\CommonTrackControls.cpp" />
     <ClCompile Include="..\..\..\src\tracks\ui\CommonTrackPanelCell.cpp" />
+    <ClCompile Include="..\..\..\src\tracks\ui\CommonTrackView.cpp" />
     <ClCompile Include="..\..\..\src\tracks\ui\EditCursorOverlay.cpp" />
     <ClCompile Include="..\..\..\src\tracks\ui\EnvelopeHandle.cpp" />
     <ClCompile Include="..\..\..\src\tracks\ui\PlayIndicatorOverlay.cpp" />
@@ -598,7 +600,9 @@
     <ClInclude Include="..\..\..\src\tracks\timetrack\ui\TimeTrackView.h" />
     <ClInclude Include="..\..\..\src\tracks\ui\SelectHandle.h" />
     <ClInclude Include="..\..\..\src\tracks\ui\BackgroundCell.h" />
+    <ClInclude Include="..\..\..\src\tracks\ui\CommonTrackControls.h" />
     <ClInclude Include="..\..\..\src\tracks\ui\CommonTrackPanelCell.h" />
+    <ClInclude Include="..\..\..\src\tracks\ui\CommonTrackView.h" />
     <ClInclude Include="..\..\..\src\tracks\labeltrack\ui\LabelTrackControls.h" />
     <ClInclude Include="..\..\..\src\tracks\labeltrack\ui\LabelTrackVRulerControls.h" />
     <ClInclude Include="..\..\..\src\tracks\timetrack\ui\TimeTrackControls.h" />
diff --git a/win/Projects/Audacity/Audacity.vcxproj.filters b/win/Projects/Audacity/Audacity.vcxproj.filters
index 02482fb63..39dbc136a 100755
--- a/win/Projects/Audacity/Audacity.vcxproj.filters
+++ b/win/Projects/Audacity/Audacity.vcxproj.filters
@@ -986,9 +986,15 @@
     <ClCompile Include="..\..\..\src\tracks\ui\TrackVRulerControls.cpp">
       <Filter>src\tracks\ui</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\tracks\ui\CommonTrackControls.cpp">
+      <Filter>src\tracks\ui</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\src\tracks\ui\CommonTrackPanelCell.cpp">
       <Filter>src\tracks\ui</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\tracks\ui\CommonTrackView.cpp">
+      <Filter>src\tracks\ui</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\src\tracks\playabletrack\notetrack\ui\NoteTrackButtonHandle.cpp">
       <Filter>src\tracks\playabletrack\notetrack\ui</Filter>
     </ClCompile>
@@ -2116,9 +2122,15 @@
     <ClInclude Include="..\..\..\src\TrackPanelMouseEvent.h">
       <Filter>src</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\tracks\ui\CommonTrackControls.h">
+      <Filter>src\tracks\ui</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\src\tracks\ui\CommonTrackPanelCell.h">
       <Filter>src\tracks\ui</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\tracks\ui\CommonTrackView.h">
+      <Filter>src\tracks\ui</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\src\widgets\BackedPanel.h">
       <Filter>src\widgets</Filter>
     </ClInclude>