diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/AppLinkActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/AppLinkActivity.java
index 09c8441a7a..976658c9cc 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/AppLinkActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/AppLinkActivity.java
@@ -130,8 +130,8 @@ public class AppLinkActivity extends FragmentActivity
 
   private void tryPlay(AppLinkHelper.PlayAction action)
   {
-    // TODO: This approach of getting the game from the game file cache without rescanning
-    // the library means that we can fail to launch games if the cache file has been deleted.
+    // TODO: This approach of getting the game from the game file cache without rescanning the
+    //       library means that we can fail to launch games if the cache file has been deleted.
 
     GameFile game = GameFileCacheService.getGameFileByGameId(action.getGameId());
 
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
index ad7925d009..79afa4f81f 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
@@ -273,8 +273,8 @@ public final class EmulationActivity extends AppCompatActivity
 
     updateOrientation();
 
-    // TODO: The accurate way to find out which console we're emulating is to
-    // first launch emulation and then ask the core which console we're emulating
+    // TODO: The accurate way to find out which console we're emulating is to first
+    //       launch emulation and then ask the core which console we're emulating
     sIsGameCubeGame = Platform.fromNativeInt(mPlatform) == Platform.GAMECUBE;
     mDeviceHasTouchScreen = getPackageManager().hasSystemFeature("android.hardware.touchscreen");
     mMotionListener = new MotionListener(this);
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/PlatformPagerAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/PlatformPagerAdapter.java
index dd13742d61..e1141bf8be 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/PlatformPagerAdapter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/PlatformPagerAdapter.java
@@ -23,7 +23,7 @@ public class PlatformPagerAdapter extends FragmentPagerAdapter
           {
                   R.drawable.ic_gamecube,
                   R.drawable.ic_wii,
-                  R.drawable.ic_folder // WiiWare TODO Have an icon here.
+                  R.drawable.ic_folder
           };
 
   public PlatformPagerAdapter(FragmentManager fm, Context context)
@@ -49,8 +49,8 @@ public class PlatformPagerAdapter extends FragmentPagerAdapter
   {
     // Hax from https://guides.codepath.com/android/Google-Play-Style-Tabs-using-TabLayout#design-support-library
     // Apparently a workaround for TabLayout not supporting icons.
-    // TODO This workaround will eventually not be necessary; switch to more legit methods when that is the case
-    // TODO Also remove additional hax from styles.xml
+    // TODO: This workaround will eventually not be necessary; switch to more legit methods when that is the case
+    // TODO: Also remove additional hax from styles.xml
     Drawable drawable = mContext.getResources().getDrawable(TAB_ICONS[position]);
     drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
 
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.java
index efd00d4abe..e34460f532 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.java
@@ -178,7 +178,7 @@ public final class SettingsActivity extends AppCompatActivity implements Setting
     }
 
     // TODO: After result of FilePicker, duplicate SettingsActivity appears.
-    //  Finish to avoid this. Is there a better method?
+    //       Finish to avoid this. Is there a better method?
     finish();
   }
 
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java
index e4862ccc10..d65a3f28f8 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java
@@ -410,8 +410,8 @@ public final class SettingsFragmentPresenter
     overclock = coreSection.getSetting(SettingsFile.KEY_OVERCLOCK_PERCENT);
 
     // TODO: Having different emuCoresEntries/emuCoresValues for each architecture is annoying.
-    // The proper solution would be to have one emuCoresEntries and one emuCoresValues
-    // and exclude the values that aren't present in PowerPC::AvailableCPUCores().
+    //       The proper solution would be to have one emuCoresEntries and one emuCoresValues
+    //       and exclude the values that aren't present in PowerPC::AvailableCPUCores().
     int defaultCpuCore = NativeLibrary.DefaultCPUCore();
     int emuCoresEntries;
     int emuCoresValues;
@@ -446,7 +446,7 @@ public final class SettingsFragmentPresenter
     {
       if (mGameID.equals(""))
       {
-        // TODO This controller_0 + i business is quite the hack. It should work, but only if the definitions are kept together and in order.
+        // TODO: This controller_0 + i business is quite the hack. It should work, but only if the definitions are kept together and in order.
         Setting gcPadSetting = mSettings.getSection(Settings.SECTION_INI_CORE)
                 .getSetting(SettingsFile.KEY_GCPAD_TYPE + i);
         sl.add(new SingleChoiceSetting(SettingsFile.KEY_GCPAD_TYPE + i, Settings.SECTION_INI_CORE,
@@ -468,7 +468,7 @@ public final class SettingsFragmentPresenter
   {
     for (int i = 0; i < 4; i++)
     {
-      // TODO This wiimote_0 + i business is quite the hack. It should work, but only if the definitions are kept together and in order.
+      // TODO: This wiimote_0 + i business is quite the hack. It should work, but only if the definitions are kept together and in order.
       if (mGameID.equals(""))
       {
         Setting wiimoteSetting = mSettings.getSection(Settings.SECTION_WIIMOTE + (i + 1))