diff --git a/cmd/fyne/internal/templates/templates.go b/cmd/fyne/internal/templates/templates.go
index 1dc10b161f..210dfdccb8 100644
--- a/cmd/fyne/internal/templates/templates.go
+++ b/cmd/fyne/internal/templates/templates.go
@@ -44,7 +44,7 @@ var (
 	// WebGLDebugJs is the content of https://raw.githubusercontent.com/KhronosGroup/WebGLDeveloperTools/b42e702487d02d5278814e0fe2e2888d234893e6/src/debug/webgl-debug.js
 	WebGLDebugJs = resourceWebglDebugJs.StaticContent
 
-	// SpinnerLigth is a spinning gif of Fyne logo with a light background
+	// SpinnerLight is a spinning gif of Fyne logo with a light background
 	SpinnerLight = resourceSpinnerlightGif.StaticContent
 
 	// CSSLight is a CSS that define color for element on the web splash screen following the light theme
diff --git a/dialog/file_test.go b/dialog/file_test.go
index 6165c60b48..05e679d590 100644
--- a/dialog/file_test.go
+++ b/dialog/file_test.go
@@ -585,9 +585,9 @@ func TestCreateNewFolderInDir(t *testing.T) {
 	defer win.Canvas().Overlays().Remove(folderDialogPopup)
 	assert.NotNil(t, folderDialogPopup)
 
-	folderDialogUi := folderDialogPopup.Content.(*fyne.Container)
+	folderDialogUI := folderDialogPopup.Content.(*fyne.Container)
 
-	createNewFolderButton := folderDialogUi.Objects[1].(*fyne.Container).Objects[0].(*fyne.Container).Objects[0].(*widget.Button)
+	createNewFolderButton := folderDialogUI.Objects[1].(*fyne.Container).Objects[0].(*fyne.Container).Objects[0].(*widget.Button)
 	assert.Equal(t, "", createNewFolderButton.Text)
 	assert.Equal(t, theme.FolderNewIcon(), createNewFolderButton.Icon)
 
diff --git a/theme/icons.go b/theme/icons.go
index 8757a38d59..d07e8d9ed3 100644
--- a/theme/icons.go
+++ b/theme/icons.go
@@ -891,7 +891,7 @@ func ErrorIcon() fyne.Resource {
 	return safeIconLookup(IconNameError)
 }
 
-// BrokenImageIconreturns a resource containing an icon to specify a broken or missing image
+// BrokenImageIcon returns a resource containing an icon to specify a broken or missing image
 //
 // Since: 2.4
 func BrokenImageIcon() fyne.Resource {
diff --git a/theme/themedtestapp.go b/theme/themedtestapp.go
index 83ac074bc8..7f1682bd4b 100644
--- a/theme/themedtestapp.go
+++ b/theme/themedtestapp.go
@@ -95,7 +95,7 @@ func (t *themedApp) Scale() float32 {
 	return 1.0
 }
 
-func (s *themedApp) ShowAnimations() bool {
+func (t *themedApp) ShowAnimations() bool {
 	return true
 }