diff --git a/src/audio/audio.cpp b/src/audio/audio.cpp
index b87624a7c..f40b7a5fa 100644
--- a/src/audio/audio.cpp
+++ b/src/audio/audio.cpp
@@ -345,7 +345,7 @@ bool Audio::initInput(const QString& deviceName)
     qDebug() << "Opening audio input" << deviceName;
     assert(!alInDev);
 
-    /// @todo Try to actually detect if our audio source is stereo
+    // TODO: Try to actually detect if our audio source is stereo
     int stereoFlag = AUDIO_CHANNELS == 1 ? AL_FORMAT_MONO16 : AL_FORMAT_STEREO16;
     const uint32_t sampleRate = AUDIO_SAMPLE_RATE;
     const uint16_t frameDuration = AUDIO_FRAME_DURATION;
diff --git a/src/chatlog/content/filetransferwidget.cpp b/src/chatlog/content/filetransferwidget.cpp
index 576d24d26..5b8e60c42 100644
--- a/src/chatlog/content/filetransferwidget.cpp
+++ b/src/chatlog/content/filetransferwidget.cpp
@@ -388,7 +388,7 @@ void FileTransferWidget::fileTransferRemotePausedUnpaused(ToxFile file, bool pau
 
 void FileTransferWidget::fileTransferBrokenUnbroken(ToxFile file, bool broken)
 {
-    /// @todo Handle broken transfer differently once we have resuming code
+    // TODO: Handle broken transfer differently once we have resuming code
     if (broken)
         onFileTransferCancelled(file);
 }
diff --git a/src/core/core.cpp b/src/core/core.cpp
index c7e8682cc..541ced288 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -267,8 +267,8 @@ void Core::start()
     if (!id.isEmpty())
         emit idSet(id);
 
-    /// @todo NOTE: This is a backwards compatibility check,
-    /// once most people have been upgraded away from the old HistoryKeeper, remove this
+    // TODO: This is a backwards compatibility check,
+    // once most people have been upgraded away from the old HistoryKeeper, remove this
     if (Nexus::getProfile()->isEncrypted())
         checkEncryptedHistory();
 
diff --git a/src/core/coredefines.h b/src/core/coredefines.h
index 1aad344ca..d9974d8d1 100644
--- a/src/core/coredefines.h
+++ b/src/core/coredefines.h
@@ -23,7 +23,7 @@
 
 #define TOXAV_RINGING_TIME 45
 
-/// @todo Put that in the settings
+// TODO: Put that in the settings
 #define TOXAV_MAX_VIDEO_WIDTH 1280
 #define TOXAV_MAX_VIDEO_HEIGHT 720
 
diff --git a/src/core/corefile.cpp b/src/core/corefile.cpp
index 7b6467279..df706dfda 100644
--- a/src/core/corefile.cpp
+++ b/src/core/corefile.cpp
@@ -471,12 +471,12 @@ void CoreFile::onFileRecvChunkCallback(Tox *tox, uint32_t friendId, uint32_t fil
 
 void CoreFile::onConnectionStatusChanged(Core* core, uint32_t friendId, bool online)
 {
-    /// @todo Actually resume broken file transfers
-    /// We need to:
-    /// - Start a new file transfer with the same 32byte file ID with toxcore
-    /// - Seek to the correct position again
-    /// - Update the fileNum in our ToxFile
-    /// - Update the users of our signals to check the 32byte tox file ID, not the uint32_t file_num (fileId)
+    // TODO: Actually resume broken file transfers
+    // We need to:
+    // - Start a new file transfer with the same 32byte file ID with toxcore
+    // - Seek to the correct position again
+    // - Update the fileNum in our ToxFile
+    // - Update the users of our signals to check the 32byte tox file ID, not the uint32_t file_num (fileId)
     ToxFile::FileStatus status = online ? ToxFile::TRANSMITTING : ToxFile::BROKEN;
     for (uint64_t key : fileMap.keys())
     {
diff --git a/src/main.cpp b/src/main.cpp
index 6a5ba491e..37d7fefa0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -130,7 +130,7 @@ int main(int argc, char *argv[])
     a.setApplicationVersion("\nGit commit: " + QString(GIT_VERSION));
 
 #if defined(Q_OS_OSX)
-    /// @todo Add setting to enable this feature.
+    // TODO: Add setting to enable this feature.
     //osx::moveToAppFolder();
     osx::migrateProfiles();
 #endif
diff --git a/src/persistence/settings.cpp b/src/persistence/settings.cpp
index e9410469e..434686fd7 100644
--- a/src/persistence/settings.cpp
+++ b/src/persistence/settings.cpp
@@ -664,7 +664,7 @@ QString Settings::getAppDataDirPath() const
                            + "Library" + QDir::separator() + "Application Support" + QDir::separator() + "Tox")+QDir::separator();
 #else
     /**
-     * @todo change QStandardPaths::DataLocation to AppDataLocation when upgrate Qt to 5.4+
+     * TODO: Change QStandardPaths::DataLocation to AppDataLocation when upgrate Qt to 5.4+
      * For now we need support Qt 5.3, so we use deprecated DataLocation
      * BTW, it's not a big deal since for linux AppDataLocation and DataLocation are equal
      */
diff --git a/src/platform/capslock_osx.cpp b/src/platform/capslock_osx.cpp
index e43bee588..e03871b49 100644
--- a/src/platform/capslock_osx.cpp
+++ b/src/platform/capslock_osx.cpp
@@ -21,9 +21,7 @@
 #if defined(__APPLE__) && defined(__MACH__)
 #include "src/platform/capslock.h"
 
-/**
- * @todo implement for osx
- */
+// TODO: Implement for osx
 bool Platform::capsLockEnabled()
 {
     return false;
diff --git a/src/widget/form/chatform.cpp b/src/widget/form/chatform.cpp
index d6cbd6209..f6ded4181 100644
--- a/src/widget/form/chatform.cpp
+++ b/src/widget/form/chatform.cpp
@@ -1010,7 +1010,7 @@ void ChatForm::SendMessageStr(QString msg)
         }
         else
         {
-            /// @todo Make faux-offline messaging work partially with the history disabled
+            // TODO: Make faux-offline messaging work partially with the history disabled
             ma->markAsSent(QDateTime::currentDateTime());
         }
 
diff --git a/src/widget/form/settings/aboutform.cpp b/src/widget/form/settings/aboutform.cpp
index 0b34daab0..dc36356f1 100644
--- a/src/widget/form/settings/aboutform.cpp
+++ b/src/widget/form/settings/aboutform.cpp
@@ -50,12 +50,11 @@ AboutForm::AboutForm()
     Translator::registerHandler(std::bind(&AboutForm::retranslateUi, this), this);
 }
 
-/**
- * @todo when we finally have stable releases: build-in a way to tell
- * nightly builds from stable releases.
- */
 void AboutForm::replaceVersions()
 {
+    // TODO: When we finally have stable releases: build-in a way to tell
+    // nightly builds from stable releases.
+
     QString TOXCORE_VERSION = QString::number(TOX_VERSION_MAJOR) + "." +
       QString::number(TOX_VERSION_MINOR) + "." +
       QString::number(TOX_VERSION_PATCH);
diff --git a/src/widget/form/settings/avform.cpp b/src/widget/form/settings/avform.cpp
index fcd2b61f5..d6001ed38 100644
--- a/src/widget/form/settings/avform.cpp
+++ b/src/widget/form/settings/avform.cpp
@@ -98,7 +98,7 @@ AVForm::~AVForm()
 void AVForm::hideEvent(QHideEvent* event)
 {
     if (subscribedToAudioIn) {
-        /// @todo this should not be done in show/hide events
+        // TODO: This should not be done in show/hide events
         Audio::getInstance().unsubscribeInput();
         subscribedToAudioIn = false;
     }
@@ -121,7 +121,7 @@ void AVForm::showEvent(QShowEvent* event)
     getVideoDevices();
 
     if (!subscribedToAudioIn) {
-        /// @todo this should not be done in show/hide events
+        // TODO: This should not be done in show/hide events
         Audio::getInstance().subscribeInput();
         subscribedToAudioIn = true;
     }